X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-patch.c;h=d49f83d364ae900862f7bb47828e9197f294b02b;hb=5b68fb428764e66dc73b2674ceb3f3e3555b59f2;hp=b0ae3a070f6713c38c3761d1a65bc73653bda191;hpb=a2a96c04cb5d7c4df7578aca5ac073d4ef05ca08;p=sliver-openvswitch.git

diff --git a/datapath/vport-patch.c b/datapath/vport-patch.c
index b0ae3a070..d49f83d36 100644
--- a/datapath/vport-patch.c
+++ b/datapath/vport-patch.c
@@ -22,6 +22,8 @@ struct device_config {
 };
 
 struct patch_vport {
+	struct rcu_head rcu;
+
 	char name[IFNAMSIZ];
 
 	/* Protected by RTNL lock. */
@@ -158,19 +160,22 @@ static int patch_modify(struct vport *vport, struct odp_port *port)
 	return err;
 }
 
+static void free_port_rcu(struct rcu_head *rcu)
+{
+	struct patch_vport *patch_vport = container_of(rcu,
+						      struct patch_vport, rcu);
+
+	kfree(patch_vport->devconf);
+	vport_free(vport_from_priv(patch_vport));
+}
+
 static int patch_destroy(struct vport *vport)
 {
 	struct patch_vport *patch_vport = patch_vport_priv(vport);
 
 	update_peers(patch_vport->name, NULL);
-	rcu_assign_pointer(patch_vport->peer, NULL);
-
 	hlist_del(&patch_vport->hash_node);
-
-	synchronize_rcu();
-
-	kfree(patch_vport->devconf);
-	vport_free(vport);
+	call_rcu(&patch_vport->rcu, free_port_rcu);
 
 	return 0;
 }