Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Florian Westphal and committed by
David S. Miller
551ddc05 d1b4c689

+3 -7
+3 -7
net/openvswitch/datapath.c
··· 422 422 struct sk_buff *nskb = NULL; 423 423 struct sk_buff *user_skb = NULL; /* to be queued to userspace */ 424 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 425 size_t len; 430 426 unsigned int hlen; 431 427 int err, dp_ifindex; ··· 462 466 hlen = skb->len; 463 467 464 468 len = upcall_msg_size(upcall_info, hlen); 465 - user_skb = genlmsg_new_unicast(len, &info, GFP_ATOMIC); 469 + user_skb = genlmsg_new(len, GFP_ATOMIC); 466 470 if (!user_skb) { 467 471 err = -ENOMEM; 468 472 goto out; ··· 872 876 return NULL; 873 877 874 878 len = ovs_flow_cmd_msg_size(acts, sfid, ufid_flags); 875 - skb = genlmsg_new_unicast(len, info, GFP_KERNEL); 879 + skb = genlmsg_new(len, GFP_KERNEL); 876 880 if (!skb) 877 881 return ERR_PTR(-ENOMEM); 878 882 ··· 1479 1483 1480 1484 static struct sk_buff *ovs_dp_cmd_alloc_info(struct genl_info *info) 1481 1485 { 1482 - return genlmsg_new_unicast(ovs_dp_cmd_msg_size(), info, GFP_KERNEL); 1486 + return genlmsg_new(ovs_dp_cmd_msg_size(), GFP_KERNEL); 1483 1487 } 1484 1488 1485 1489 /* Called with rcu_read_lock or ovs_mutex. */