1 files changed, 9 insertions, 4 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 2b0266484c84..25f87102ab66 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -88,6 +88,8 @@ struct wireless_dev;
 #define NETDEV_TX_BUSY 1        /* driver tx path was busy*/
 #define NETDEV_TX_LOCKED -1     /* driver tx lock was already taken */
 
+#ifdef  __KERNEL__
+
 /*
  *      Compute the worst case header length according to the protocols
  *      used.
@@ -114,6 +116,8 @@ struct wireless_dev;
 #define MAX_HEADER (LL_MAX_HEADER + 48)
 #endif
 
+#endif  /*  __KERNEL__  */
+
 struct net_device_subqueue
 {
         /* Give a control state for each queue.  This struct may contain
@@ -514,12 +518,10 @@ struct net_device
 #define NETIF_F_NETNS_LOCAL     8192    /* Does not change network namespaces */
 #define NETIF_F_MULTI_QUEUE     16384   /* Has multiple TX/RX queues */
 #define NETIF_F_LRO             32768   /* large receive offload */
-#define NETIF_F_VLAN_TSO        65536   /* Supports TSO for VLANs */
-#define NETIF_F_VLAN_CSUM       131072  /* Supports TX checksumming for VLANs */
 
         /* Segmentation offload features */
-#define NETIF_F_GSO_SHIFT       20
-#define NETIF_F_GSO_MASK        0xfff00000
+#define NETIF_F_GSO_SHIFT       16
+#define NETIF_F_GSO_MASK        0xffff0000
 #define NETIF_F_TSO             (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
 #define NETIF_F_UFO             (SKB_GSO_UDP << NETIF_F_GSO_SHIFT)
 #define NETIF_F_GSO_ROBUST      (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
@@ -747,6 +749,9 @@ struct net_device
         /* rtnetlink link ops */
         const struct rtnl_link_ops *rtnl_link_ops;
 
+        /* VLAN feature mask */
+        unsigned long vlan_features;
+
         /* for setting kernel sock attribute on TCP connection setup */
 #define GSO_MAX_SIZE            65536
         unsigned int            gso_max_size;