X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-netdev.c;h=f8948fa79ce8603366f524fae4605a4531c49c49;hb=cd2a59e99c8a94b15655e29a4dc100a0dc221568;hp=727194e3e767fd1671b7cc53254265c0fc453d9b;hpb=55a6ee411eededa4969a05233ced3ed69580c157;p=sliver-openvswitch.git

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 727194e3e..f8948fa79 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -152,19 +152,23 @@ static struct vport *netdev_create(const struct vport_parms *parms)
 		goto error_put;
 	}
 
+	rtnl_lock();
 	err = netdev_rx_handler_register(netdev_vport->dev, netdev_frame_hook,
 					 vport);
 	if (err)
-		goto error_put;
+		goto error_unlock;
 
 	dev_set_promiscuity(netdev_vport->dev, 1);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
 	dev_disable_lro(netdev_vport->dev);
 #endif
 	netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH;
+	rtnl_unlock();
 
 	return vport;
 
+error_unlock:
+	rtnl_unlock();
 error_put:
 	dev_put(netdev_vport->dev);
 error_free_vport:
@@ -186,9 +190,11 @@ static void netdev_destroy(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
+	rtnl_lock();
 	netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;
 	netdev_rx_handler_unregister(netdev_vport->dev);
 	dev_set_promiscuity(netdev_vport->dev, -1);
+	rtnl_unlock();
 
 	call_rcu(&netdev_vport->rcu, free_port_rcu);
 }