iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openvswitch: Revert: "Enable memory mapped Netlink i/o"

Browse Source 
revert commit 795449d8b846 ("openvswitch: Enable memory mapped Netlink i/o").
Following the mmaped netlink removal this code can be removed.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Westphal 2016-02-18 15:03:25 +01:00 committed by David S. Miller
parent d1b4c689d4
commit 551ddc057e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/openvswitch/datapath.c
View File

@ -422,10 +422,6 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
struct sk_buff *nskb = NULL; struct sk_buff *nskb = NULL;
struct sk_buff *user_skb = NULL; /* to be queued to userspace */ struct sk_buff *user_skb = NULL; /* to be queued to userspace */
struct nlattr *nla; struct nlattr *nla;
struct genl_info info = {
.dst_sk = ovs_dp_get_net(dp)->genl_sock,
.snd_portid = upcall_info->portid,
};
size_t len; size_t len;
unsigned int hlen; unsigned int hlen;
int err, dp_ifindex; int err, dp_ifindex;
@ -466,7 +462,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
hlen = skb->len; hlen = skb->len;
len = upcall_msg_size(upcall_info, hlen); len = upcall_msg_size(upcall_info, hlen);
user_skb = genlmsg_new_unicast(len, &info, GFP_ATOMIC); user_skb = genlmsg_new(len, GFP_ATOMIC);
if (!user_skb) { if (!user_skb) {
err = -ENOMEM; err = -ENOMEM;
goto out; goto out;
@ -876,7 +872,7 @@ static struct sk_buff *ovs_flow_cmd_alloc_info(const struct sw_flow_actions *act
return NULL; return NULL;
len = ovs_flow_cmd_msg_size(acts, sfid, ufid_flags); 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) if (!skb)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -1483,7 +1479,7 @@ error:
static struct sk_buff *ovs_dp_cmd_alloc_info(struct genl_info *info) static struct sk_buff *ovs_dp_cmd_alloc_info(struct genl_info *info)
{ {
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. */