Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / dp_notify.c

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index ec573a5..b5178fc 100644 (file)
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -18,6 +18,8 @@
 
 #include <linux/netdevice.h>
 #include <net/genetlink.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
 
 #include "datapath.h"
 #include "vport-internal_dev.h"
@@ -33,7 +35,7 @@ static void dp_detach_port_notify(struct vport *vport)
                                          OVS_VPORT_CMD_DEL);
        ovs_dp_detach_port(vport);
        if (IS_ERR(notify)) {
-               netlink_set_err(GENL_SOCK(ovs_dp_get_net(dp)), 0,
+               netlink_set_err(ovs_dp_get_net(dp)->genl_sock, 0,
                                ovs_dp_vport_multicast_group.id,
                                PTR_ERR(notify));
                return;
@@ -88,7 +90,7 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
 
        if (event == NETDEV_UNREGISTER) {
                ovs_net = net_generic(dev_net(dev), ovs_net_id);
-               queue_work(&ovs_net->dp_notify_work);
+               queue_work(system_wq, &ovs_net->dp_notify_work);
        }
 
        return NOTIFY_DONE;