X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-netdev.c;h=2583566b1afd884005e084542122ffc2840fbbbb;hb=431488e6638d3fbb53d215fa10d2ff2d8f1c2824;hp=21fa6a0e123a8e0eebce6a72c3032f098f77f672;hpb=3f6256afdcf7021b0ce85dfe0c4afb62b967bef4;p=sliver-openvswitch.git

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 21fa6a0e1..2583566b1 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -22,12 +22,15 @@
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \
+    !defined(HAVE_VLAN_BUG_WORKAROUND)
 #include <linux/module.h>
 
 static int vlan_tso __read_mostly = 0;
 module_param(vlan_tso, int, 0644);
 MODULE_PARM_DESC(vlan_tso, "Enable TSO for VLAN packets");
+#else
+#define vlan_tso true
 #endif
 
 /* If the native device stats aren't 64 bit use the vport stats tracking instead. */
@@ -266,6 +269,19 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
 	vport_receive(vport, skb);
 }
 
+static bool dev_supports_vlan_tx(struct net_device *dev)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
+	/* Software fallback means every device supports vlan_tci on TX. */
+	return true;
+#elif defined(HAVE_VLAN_BUG_WORKAROUND)
+	return dev->features & NETIF_F_HW_VLAN_TX;
+#else
+	/* Assume that the driver is buggy. */
+	return false;
+#endif
+}
+
 static int netdev_send(struct vport *vport, struct sk_buff *skb)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
@@ -274,10 +290,13 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb)
 	skb->dev = netdev_vport->dev;
 	forward_ip_summed(skb);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
-	if (vlan_tx_tag_present(skb)) {
+	if (vlan_tx_tag_present(skb) && !dev_supports_vlan_tx(skb->dev)) {
 		int err;
-		int features = skb->dev->features & skb->dev->vlan_features;
+		int features = 0;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+		features = skb->dev->features & skb->dev->vlan_features;
+#endif
 
 		err = vswitch_skb_checksum_setup(skb);
 		if (unlikely(err)) {
@@ -335,7 +354,6 @@ tag:
 			return 0;
 		vlan_set_tci(skb, 0);
 	}
-#endif
 
 	len = skb->len;
 	dev_queue_xmit(skb);