X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=86171dbc9cb305db2ad1d84b72d9e599e56c84c2;hb=2e4f5fcf3f5837de6805ccad58cd852a7cca595d;hp=c0e250db50bef6323e72bce462735e953f0515f9;hpb=e779d8d90d65297473febcf82ec44c9225cc4fe3;p=openvswitch

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index c0e250db..86171dbc 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -14,13 +14,14 @@
 #include <linux/skbuff.h>
 #include <linux/version.h>
 
+#include "checksum.h"
 #include "datapath.h"
 #include "vport-generic.h"
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
 struct internal_dev {
-	struct vport *attached_vport, *vport;
+	struct vport *vport;
 	struct net_device_stats stats;
 };
 
@@ -99,10 +100,6 @@ static void internal_dev_getinfo(struct net_device *netdev,
 	struct vport *vport = internal_dev_get_vport(netdev);
 
 	strcpy(info->driver, "openvswitch");
-
-	if (!vport)
-		return;
-
 	sprintf(info->bus_info, "%d.%d", vport->dp->dp_idx, vport->port_no);
 }
 
@@ -124,7 +121,7 @@ static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu)
 	if (new_mtu < 68)
 		return -EINVAL;
 
-	if (vport && new_mtu > dp_min_mtu(vport->dp))
+	if (new_mtu > dp_min_mtu(vport->dp))
 		return -EINVAL;
 
 	netdev->mtu = new_mtu;
@@ -206,6 +203,9 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
 	if (err)
 		goto error_free_netdev;
 
+	dev_set_promiscuity(netdev_vport->dev, 1);
+	netif_start_queue(netdev_vport->dev);
+
 	return vport;
 
 error_free_netdev:
@@ -220,32 +220,13 @@ static int internal_dev_destroy(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
-	unregister_netdevice(netdev_vport->dev);
-	vport_free(vport);
-
-	return 0;
-}
-
-static int internal_dev_attach(struct vport *vport)
-{
-	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-	struct internal_dev *internal_dev = internal_dev_priv(netdev_vport->dev);
-
-	rcu_assign_pointer(internal_dev->attached_vport, internal_dev->vport);
-	dev_set_promiscuity(netdev_vport->dev, 1);
-	netif_start_queue(netdev_vport->dev);
-
-	return 0;
-}
-
-static int internal_dev_detach(struct vport *vport)
-{
-	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-	struct internal_dev *internal_dev = internal_dev_priv(netdev_vport->dev);
-
 	netif_stop_queue(netdev_vport->dev);
 	dev_set_promiscuity(netdev_vport->dev, -1);
-	rcu_assign_pointer(internal_dev->attached_vport, NULL);
+
+	synchronize_rcu();
+
+	unregister_netdevice(netdev_vport->dev);
+	vport_free(vport);
 
 	return 0;
 }
@@ -277,8 +258,6 @@ const struct vport_ops internal_vport_ops = {
 	.flags		= VPORT_F_REQUIRED | VPORT_F_GEN_STATS | VPORT_F_FLOW,
 	.create		= internal_dev_create,
 	.destroy	= internal_dev_destroy,
-	.attach		= internal_dev_attach,
-	.detach		= internal_dev_detach,
 	.set_mtu	= netdev_set_mtu,
 	.set_addr	= netdev_set_addr,
 	.get_name	= netdev_get_name,
@@ -313,7 +292,7 @@ struct vport *internal_dev_get_vport(struct net_device *netdev)
 
 	if (!is_internal_dev(netdev))
 		return NULL;
-	
+
 	internal_dev = internal_dev_priv(netdev);
-	return rcu_dereference(internal_dev->attached_vport);
+	return rcu_dereference(internal_dev->vport);
 }