projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: genlmsg_new_unicast to genlmsg_new
[cascardo/ovs.git]
/
datapath
/
datapath.c
diff --git
a/datapath/datapath.c
b/datapath/datapath.c
index
3d2385e
..
6e0d911
100644
(file)
--- a/
datapath/datapath.c
+++ b/
datapath/datapath.c
@@
-436,12
+436,6
@@
static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
struct sk_buff *nskb = NULL;
struct sk_buff *user_skb = NULL; /* to be queued to userspace */
struct nlattr *nla;
struct sk_buff *nskb = NULL;
struct sk_buff *user_skb = NULL; /* to be queued to userspace */
struct nlattr *nla;
- struct genl_info info = {
-#ifdef HAVE_GENLMSG_NEW_UNICAST
- .dst_sk = ovs_dp_get_net(dp)->genl_sock,
-#endif
- .snd_portid = upcall_info->portid,
- };
size_t len;
unsigned int hlen;
int err, dp_ifindex;
size_t len;
unsigned int hlen;
int err, dp_ifindex;
@@
-482,7
+476,7
@@
static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
hlen = skb->len;
len = upcall_msg_size(upcall_info, hlen - cutlen);
hlen = skb->len;
len = upcall_msg_size(upcall_info, hlen - cutlen);
- user_skb = genlmsg_new
_unicast(len, &info
, GFP_ATOMIC);
+ user_skb = genlmsg_new
(len
, GFP_ATOMIC);
if (!user_skb) {
err = -ENOMEM;
goto out;
if (!user_skb) {
err = -ENOMEM;
goto out;
@@
-909,7
+903,7
@@
static struct sk_buff *ovs_flow_cmd_alloc_info(const struct sw_flow_actions *act
return NULL;
len = ovs_flow_cmd_msg_size(acts, sfid, ufid_flags);
return NULL;
len = ovs_flow_cmd_msg_size(acts, sfid, ufid_flags);
- skb = genlmsg_new
_unicast(len, info
, GFP_KERNEL);
+ skb = genlmsg_new
(len
, GFP_KERNEL);
if (!skb)
return ERR_PTR(-ENOMEM);
if (!skb)
return ERR_PTR(-ENOMEM);
@@
-1522,9
+1516,9
@@
error:
return -EMSGSIZE;
}
return -EMSGSIZE;
}
-static struct sk_buff *ovs_dp_cmd_alloc_info(
struct genl_info *info
)
+static struct sk_buff *ovs_dp_cmd_alloc_info(
void
)
{
{
- return genlmsg_new
_unicast(ovs_dp_cmd_msg_size(), info
, GFP_KERNEL);
+ return genlmsg_new
(ovs_dp_cmd_msg_size()
, GFP_KERNEL);
}
/* Called with rcu_read_lock or ovs_mutex. */
}
/* Called with rcu_read_lock or ovs_mutex. */
@@
-1577,7
+1571,7
@@
static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
if (!a[OVS_DP_ATTR_NAME] || !a[OVS_DP_ATTR_UPCALL_PID])
goto err;
if (!a[OVS_DP_ATTR_NAME] || !a[OVS_DP_ATTR_UPCALL_PID])
goto err;
- reply = ovs_dp_cmd_alloc_info(
info
);
+ reply = ovs_dp_cmd_alloc_info();
if (!reply)
return -ENOMEM;
if (!reply)
return -ENOMEM;
@@
-1698,7
+1692,7
@@
static int ovs_dp_cmd_del(struct sk_buff *skb, struct genl_info *info)
struct datapath *dp;
int err;
struct datapath *dp;
int err;
- reply = ovs_dp_cmd_alloc_info(
info
);
+ reply = ovs_dp_cmd_alloc_info();
if (!reply)
return -ENOMEM;
if (!reply)
return -ENOMEM;
@@
-1730,7
+1724,7
@@
static int ovs_dp_cmd_set(struct sk_buff *skb, struct genl_info *info)
struct datapath *dp;
int err;
struct datapath *dp;
int err;
- reply = ovs_dp_cmd_alloc_info(
info
);
+ reply = ovs_dp_cmd_alloc_info();
if (!reply)
return -ENOMEM;
if (!reply)
return -ENOMEM;
@@
-1763,7
+1757,7
@@
static int ovs_dp_cmd_get(struct sk_buff *skb, struct genl_info *info)
struct datapath *dp;
int err;
struct datapath *dp;
int err;
- reply = ovs_dp_cmd_alloc_info(
info
);
+ reply = ovs_dp_cmd_alloc_info();
if (!reply)
return -ENOMEM;
if (!reply)
return -ENOMEM;