X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=1df61801179a0871f46072dbfce71a236f5cf7ce;hb=f696f12fbe84f49d650f48c45ce1a24b94547ad2;hp=c4de2be66eaf0b55a2a4c795c8cfdb016537f3ac;hpb=94903c989826268a7fab3c730cd7d0b35ef423d5;p=openvswitch

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index c4de2be6..1df61801 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -10,17 +10,17 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
-#include <linux/rcupdate.h>
 #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;
 };
 
@@ -71,13 +71,10 @@ static int internal_dev_mac_addr(struct net_device *dev, void *p)
 /* Called with rcu_read_lock and bottom-halves disabled. */
 static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
-	struct internal_dev *internal_dev = internal_dev_priv(netdev);
-	struct vport *vport = rcu_dereference(internal_dev->vport);
-
 	compute_ip_summed(skb, true);
 	OVS_CB(skb)->flow = NULL;
 
-	vport_receive(vport, skb);
+	vport_receive(internal_dev_priv(netdev)->vport, skb);
 	return 0;
 }
 
@@ -96,17 +93,7 @@ static int internal_dev_stop(struct net_device *netdev)
 static void internal_dev_getinfo(struct net_device *netdev,
 				 struct ethtool_drvinfo *info)
 {
-	struct vport *vport = internal_dev_get_vport(netdev);
-	struct dp_port *dp_port;
-
 	strcpy(info->driver, "openvswitch");
-
-	if (!vport)
-		return;
-
-	dp_port = vport_get_dp_port(vport);
-	if (dp_port)
-		sprintf(info->bus_info, "%d.%d", dp_port->dp->dp_idx, dp_port->port_no);
 }
 
 static const struct ethtool_ops internal_dev_ethtool_ops = {
@@ -127,14 +114,8 @@ static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu)
 	if (new_mtu < 68)
 		return -EINVAL;
 
-	if (vport) {
-		struct dp_port *dp_port = vport_get_dp_port(vport);
-
-		if (dp_port) {
-			if (new_mtu > dp_min_mtu(dp_port->dp))
-				return -EINVAL;
-		}
-	}
+	if (new_mtu > dp_min_mtu(vport->dp))
+		return -EINVAL;
 
 	netdev->mtu = new_mtu;
 	return 0;
@@ -194,7 +175,7 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
 	struct internal_dev *internal_dev;
 	int err;
 
-	vport = vport_alloc(sizeof(struct netdev_vport), &internal_vport_ops);
+	vport = vport_alloc(sizeof(struct netdev_vport), &internal_vport_ops, parms);
 	if (IS_ERR(vport)) {
 		err = PTR_ERR(vport);
 		goto error;
@@ -209,12 +190,15 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
 	}
 
 	internal_dev = internal_dev_priv(netdev_vport->dev);
-	rcu_assign_pointer(internal_dev->vport, vport);
+	internal_dev->vport = vport;
 
 	err = register_netdevice(netdev_vport->dev);
 	if (err)
 		goto error_free_netdev;
 
+	dev_set_promiscuity(netdev_vport->dev, 1);
+	netif_start_queue(netdev_vport->dev);
+
 	return vport;
 
 error_free_netdev:
@@ -229,32 +213,12 @@ 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);
+
+	unregister_netdevice(netdev_vport->dev);
+	/* unregister_netdevice() waits for an RCU grace period. */
+	vport_free(vport);
 
 	return 0;
 }
@@ -282,12 +246,10 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 }
 
 const struct vport_ops internal_vport_ops = {
-	.type		= "internal",
+	.type		= ODP_VPORT_TYPE_INTERNAL,
 	.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,
@@ -318,11 +280,8 @@ int is_internal_vport(const struct vport *vport)
 
 struct vport *internal_dev_get_vport(struct net_device *netdev)
 {
-	struct internal_dev *internal_dev;
-
 	if (!is_internal_dev(netdev))
 		return NULL;
-	
-	internal_dev = internal_dev_priv(netdev);
-	return rcu_dereference(internal_dev->attached_vport);
+
+	return internal_dev_priv(netdev)->vport;
 }