diff options
author | Florian Westphal <fw@strlen.de> | 2016-02-18 09:03:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-18 11:42:18 -0500 |
commit | 551ddc057e290cc07ff900050da242f35d615d3c (patch) | |
tree | c907a36e84060a5a2bc68119bc2f9ef1426335d7 /net/openvswitch/datapath.c | |
parent | d1b4c689d4130bcfd3532680b64db562300716b6 (diff) |
openvswitch: Revert: "Enable memory mapped Netlink i/o"
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>
Diffstat (limited to 'net/openvswitch/datapath.c')
-rw-r--r-- | net/openvswitch/datapath.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index d6f7fe92744a..35a2659a277e 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -422,10 +422,6 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, | |||
422 | struct sk_buff *nskb = NULL; | 422 | struct sk_buff *nskb = NULL; |
423 | struct sk_buff *user_skb = NULL; /* to be queued to userspace */ | 423 | struct sk_buff *user_skb = NULL; /* to be queued to userspace */ |
424 | struct nlattr *nla; | 424 | struct nlattr *nla; |
425 | struct genl_info info = { | ||
426 | .dst_sk = ovs_dp_get_net(dp)->genl_sock, | ||
427 | .snd_portid = upcall_info->portid, | ||
428 | }; | ||
429 | size_t len; | 425 | size_t len; |
430 | unsigned int hlen; | 426 | unsigned int hlen; |
431 | int err, dp_ifindex; | 427 | int err, dp_ifindex; |
@@ -466,7 +462,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, | |||
466 | hlen = skb->len; | 462 | hlen = skb->len; |
467 | 463 | ||
468 | len = upcall_msg_size(upcall_info, hlen); | 464 | len = upcall_msg_size(upcall_info, hlen); |
469 | user_skb = genlmsg_new_unicast(len, &info, GFP_ATOMIC); | 465 | user_skb = genlmsg_new(len, GFP_ATOMIC); |
470 | if (!user_skb) { | 466 | if (!user_skb) { |
471 | err = -ENOMEM; | 467 | err = -ENOMEM; |
472 | goto out; | 468 | goto out; |
@@ -876,7 +872,7 @@ static struct sk_buff *ovs_flow_cmd_alloc_info(const struct sw_flow_actions *act | |||
876 | return NULL; | 872 | return NULL; |
877 | 873 | ||
878 | len = ovs_flow_cmd_msg_size(acts, sfid, ufid_flags); | 874 | len = ovs_flow_cmd_msg_size(acts, sfid, ufid_flags); |
879 | skb = genlmsg_new_unicast(len, info, GFP_KERNEL); | 875 | skb = genlmsg_new(len, GFP_KERNEL); |
880 | if (!skb) | 876 | if (!skb) |
881 | return ERR_PTR(-ENOMEM); | 877 | return ERR_PTR(-ENOMEM); |
882 | 878 | ||
@@ -1483,7 +1479,7 @@ error: | |||
1483 | 1479 | ||
1484 | static struct sk_buff *ovs_dp_cmd_alloc_info(struct genl_info *info) | 1480 | static struct sk_buff *ovs_dp_cmd_alloc_info(struct genl_info *info) |
1485 | { | 1481 | { |
1486 | return genlmsg_new_unicast(ovs_dp_cmd_msg_size(), info, GFP_KERNEL); | 1482 | return genlmsg_new(ovs_dp_cmd_msg_size(), GFP_KERNEL); |
1487 | } | 1483 | } |
1488 | 1484 | ||
1489 | /* Called with rcu_read_lock or ovs_mutex. */ | 1485 | /* Called with rcu_read_lock or ovs_mutex. */ |