X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=5b3b2b3db7014448a2d677c6c73124996347dee7;hb=db5b4525b20e0fd6a079831638b5eb3f9fb131f2;hp=86171dbc9cb305db2ad1d84b72d9e599e56c84c2;hpb=dd8d6b8cd4d708553037e306d41d1c501d3cecad;p=sliver-openvswitch.git

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 86171dbc9..5b3b2b3db 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -1,21 +1,23 @@
 /*
- * 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
  * kernel, by Linus Torvalds and others.
  */
 
+#include <linux/hardirq.h>
+#include <linux/if_vlan.h>
 #include <linux/kernel.h>
 #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 "vlan.h"
 #include "vport-generic.h"
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
@@ -72,13 +74,15 @@ 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);
+	if (unlikely(compute_ip_summed(skb, true))) {
+		kfree_skb(skb);
+		return 0;
+	}
 
-	compute_ip_summed(skb, true);
+	vlan_copy_skb_tci(skb);
 	OVS_CB(skb)->flow = NULL;
 
-	vport_receive(vport, skb);
+	vport_receive(internal_dev_priv(netdev)->vport, skb);
 	return 0;
 }
 
@@ -97,10 +101,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);
-
 	strcpy(info->driver, "openvswitch");
-	sprintf(info->bus_info, "%d.%d", vport->dp->dp_idx, vport->port_no);
 }
 
 static const struct ethtool_ops internal_dev_ethtool_ops = {
@@ -136,6 +137,14 @@ static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int
 	return -EOPNOTSUPP;
 }
 
+static void internal_dev_destructor(struct net_device *dev)
+{
+	struct vport *vport = internal_dev_get_vport(dev);
+
+	vport_free(vport);
+	free_netdev(dev);
+}
+
 #ifdef HAVE_NET_DEVICE_OPS
 static const struct net_device_ops internal_dev_netdev_ops = {
 	.ndo_open = internal_dev_open,
@@ -164,7 +173,7 @@ static void do_setup(struct net_device *netdev)
 	netdev->change_mtu = internal_dev_change_mtu;
 #endif
 
-	netdev->destructor = free_netdev;
+	netdev->destructor = internal_dev_destructor;
 	SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
 	netdev->tx_queue_len = 0;
 
@@ -172,6 +181,11 @@ static void do_setup(struct net_device *netdev)
 	netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
 				NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+	netdev->vlan_features = netdev->features;
+	netdev->features |= NETIF_F_HW_VLAN_TX;
+#endif
+
 	vport_gen_rand_ether_addr(netdev->dev_addr);
 }
 
@@ -197,7 +211,7 @@ 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)
@@ -223,10 +237,8 @@ static int internal_dev_destroy(struct vport *vport)
 	netif_stop_queue(netdev_vport->dev);
 	dev_set_promiscuity(netdev_vport->dev, -1);
 
-	synchronize_rcu();
-
+	/* unregister_netdevice() waits for an RCU grace period. */
 	unregister_netdevice(netdev_vport->dev);
-	vport_free(vport);
 
 	return 0;
 }
@@ -236,10 +248,16 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 	struct net_device *netdev = netdev_vport_priv(vport)->dev;
 	int len;
 
-	skb->dev = netdev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+	if (unlikely(vlan_deaccel_tag(skb)))
+		return 0;
+#endif
+
 	len = skb->len;
+	skb->dev = netdev;
 	skb->pkt_type = PACKET_HOST;
 	skb->protocol = eth_type_trans(skb, netdev);
+	forward_ip_summed(skb, false);
 
 	if (in_interrupt())
 		netif_rx(skb);
@@ -254,7 +272,7 @@ 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,
@@ -288,11 +306,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->vport);
+	return internal_dev_priv(netdev)->vport;
 }