X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-netdev.c;h=11faf8ad11b8157c7ad2940b2064e1b3d450a8cc;hb=76f1c218bd84e44666c5a0ae54d543dbce42c376;hp=363651bd9ae305e215bdcecaa0c0cbba092fb473;hpb=f632c8fc817ff5597007a795b51574bddd32563a;p=openvswitch

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 363651bd..11faf8ad 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -18,9 +18,18 @@
 
 #include "checksum.h"
 #include "datapath.h"
+#include "vlan.h"
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+#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");
+#endif
+
 /* If the native device stats aren't 64 bit use the vport stats tracking instead. */
 #define USE_VPORT_STATS (sizeof(((struct net_device_stats *)0)->rx_bytes) < sizeof(u64))
 
@@ -252,6 +261,7 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
 
 	skb_push(skb, ETH_HLEN);
 	compute_ip_summed(skb, false);
+	vlan_copy_skb_tci(skb);
 
 	vport_receive(vport, skb);
 }
@@ -259,10 +269,79 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
 static int netdev_send(struct vport *vport, struct sk_buff *skb)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-	int len = skb->len;
+	int len;
 
 	skb->dev = netdev_vport->dev;
 	forward_ip_summed(skb);
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+	if (vlan_tx_tag_present(skb)) {
+		int err;
+		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)) {
+			kfree_skb(skb);
+			return 0;
+		}
+
+		if (!vlan_tso)
+			features &= ~(NETIF_F_TSO | NETIF_F_TSO6 |
+				      NETIF_F_UFO | NETIF_F_FSO);
+
+		if (skb_is_gso(skb) &&
+		    (!skb_gso_ok(skb, features) ||
+		     unlikely(skb->ip_summed != CHECKSUM_PARTIAL))) {
+			struct sk_buff *nskb;
+
+			nskb = skb_gso_segment(skb, features);
+			if (!nskb) {
+				if (unlikely(skb_cloned(skb) &&
+				    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))) {
+					kfree_skb(skb);
+					return 0;
+				}
+
+				skb_shinfo(skb)->gso_type &= ~SKB_GSO_DODGY;
+				goto tag;
+			}
+
+			kfree_skb(skb);
+			skb = nskb;
+			if (IS_ERR(skb))
+				return 0;
+
+			len = 0;
+			do {
+				nskb = skb->next;
+				skb->next = NULL;
+
+				skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb));
+				if (likely(skb)) {
+					len += skb->len;
+					vlan_set_tci(skb, 0);
+					dev_queue_xmit(skb);
+				}
+
+				skb = nskb;
+			} while (skb);
+
+			return len;
+		}
+
+tag:
+		skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb));
+		if (unlikely(!skb))
+			return 0;
+		vlan_set_tci(skb, 0);
+	}
+#endif
+
+	len = skb->len;
 	dev_queue_xmit(skb);
 
 	return len;
@@ -286,7 +365,7 @@ struct vport *netdev_get_vport(struct net_device *dev)
 }
 
 const struct vport_ops netdev_vport_ops = {
-	.type		= "netdev",
+	.type		= ODP_VPORT_TYPE_NETDEV,
 	.flags          = (VPORT_F_REQUIRED |
 			  (USE_VPORT_STATS ? VPORT_F_GEN_STATS : 0)),
 	.init		= netdev_init,