1 files changed, 5 insertions, 2 deletions

diff --git a/net/openvswitch/dp_notify.c b/net/openvswitch/dp_notify.c
index c3235675f359..5c2dab276109 100644
--- a/net/openvswitch/dp_notify.c
+++ b/net/openvswitch/dp_notify.c
@@ -65,8 +65,7 @@ void ovs_dp_notify_wq(struct work_struct *work)
                                         continue;
 
                                 netdev_vport = netdev_vport_priv(vport);
-                                if (netdev_vport->dev->reg_state == NETREG_UNREGISTERED ||
-                                    netdev_vport->dev->reg_state == NETREG_UNREGISTERING)
+                                if (!(netdev_vport->dev->priv_flags & IFF_OVS_DATAPATH))
                                         dp_detach_port_notify(vport);
                         }
                 }
@@ -88,6 +87,10 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
                 return NOTIFY_DONE;
 
         if (event == NETDEV_UNREGISTER) {
+                /* upper_dev_unlink and decrement promisc immediately */
+                ovs_netdev_detach_dev(vport);
+
+                /* schedule vport destroy, dev_put and genl notification */
                 ovs_net = net_generic(dev_net(dev), ovs_net_id);
                 queue_work(system_wq, &ovs_net->dp_notify_work);
         }