diff options
author | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
commit | cefd81cfeca14ec4c63cc748441634f1d4c0eb3f (patch) | |
tree | b4541c563d40c4600e79319c2e98919caa19cede /net/openvswitch/dp_notify.c | |
parent | 3731a334c012ed825a87e1f152bbf980f79dabb2 (diff) | |
parent | 15eac2a74277bc7de68a7c2a64a7c91b4b6f5961 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/openvswitch/dp_notify.c')
-rw-r--r-- | net/openvswitch/dp_notify.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/openvswitch/dp_notify.c b/net/openvswitch/dp_notify.c index 36dcee8fc84..5558350e0d3 100644 --- a/net/openvswitch/dp_notify.c +++ b/net/openvswitch/dp_notify.c @@ -41,19 +41,21 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event, case NETDEV_UNREGISTER: if (!ovs_is_internal_dev(dev)) { struct sk_buff *notify; + struct datapath *dp = vport->dp; notify = ovs_vport_cmd_build_info(vport, 0, 0, OVS_VPORT_CMD_DEL); ovs_dp_detach_port(vport); if (IS_ERR(notify)) { - netlink_set_err(init_net.genl_sock, 0, + netlink_set_err(ovs_dp_get_net(dp)->genl_sock, 0, ovs_dp_vport_multicast_group.id, PTR_ERR(notify)); break; } - genlmsg_multicast(notify, 0, ovs_dp_vport_multicast_group.id, - GFP_KERNEL); + genlmsg_multicast_netns(ovs_dp_get_net(dp), notify, 0, + ovs_dp_vport_multicast_group.id, + GFP_KERNEL); } break; } |