datapath: Drop support for kernel older than 3.10

[mirror_ovs.git] / datapath / linux / compat / gso.c

diff --git a/datapath/linux/compat/gso.c b/datapath/linux/compat/gso.c
index c52b2b136061f4d0854c1fe5d2504fa8459d0cec..fb4749a7e8ad02614114a2e4d9ad025b49c565bb 100644 (file)
--- a/datapath/linux/compat/gso.c
+++ b/datapath/linux/compat/gso.c
@@ -39,18 +39,6 @@
 #include <net/xfrm.h>
 
 #include "gso.h"
-#include "vlan.h"
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \
-       !defined(HAVE_VLAN_BUG_WORKAROUND)
-#include <linux/module.h>
-
-static int vlan_tso __read_mostly;
-module_param(vlan_tso, int, 0644);
-MODULE_PARM_DESC(vlan_tso, "Enable TSO for VLAN packets");
-#else
-#define vlan_tso true
-#endif
 
 #ifdef OVS_USE_COMPAT_GSO_SEGMENTATION
 static bool dev_supports_vlan_tx(struct net_device *dev)
@@ -106,15 +94,11 @@ int rpl_dev_queue_xmit(struct sk_buff *skb)
                features = netif_skb_features(skb);
 
                if (vlan) {
-                       if (!vlan_tso)
-                               features &= ~(NETIF_F_TSO | NETIF_F_TSO6 |
-                                             NETIF_F_UFO | NETIF_F_FSO);
-
                        skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
                                                        skb_vlan_tag_get(skb));
                        if (unlikely(!skb))
                                return err;
-                       vlan_set_tci(skb, 0);
+                       skb->vlan_tci = 0;
                }
 
                /* As of v3.11 the kernel provides an mpls_features field in