Merge branch 'linus' into x86/irqstats

3 files changed, 3 insertions, 14 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 51961300b586..ab2225da0ee2 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -387,14 +387,8 @@ static void vlan_transfer_features(struct net_device *dev,
 {
         unsigned long old_features = vlandev->features;
 
-        if (dev->features & NETIF_F_VLAN_TSO) {
-                vlandev->features &= ~VLAN_TSO_FEATURES;
-                vlandev->features |= dev->features & VLAN_TSO_FEATURES;
-        }
-        if (dev->features & NETIF_F_VLAN_CSUM) {
-                vlandev->features &= ~NETIF_F_ALL_CSUM;
-                vlandev->features |= dev->features & NETIF_F_ALL_CSUM;
-        }
+        vlandev->features &= ~dev->vlan_features;
+        vlandev->features |= dev->features & dev->vlan_features;
 
         if (old_features != vlandev->features)
                 netdev_features_change(vlandev);
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 79625696e86a..5229a72c7ea1 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -7,8 +7,6 @@
 #define VLAN_GRP_HASH_SIZE      (1 << VLAN_GRP_HASH_SHIFT)
 #define VLAN_GRP_HASH_MASK      (VLAN_GRP_HASH_SIZE - 1)
 
-#define VLAN_TSO_FEATURES       (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG)
-
 /*  Find a VLAN device by the MAC address of its Ethernet device, and
  *  it's VLAN ID.  The default configuration is to have VLAN's scope
  *  to be box-wide, so the MAC will be ignored.  The mac will only be
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index b1cfbaa88db2..5d055c242ed8 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -663,10 +663,7 @@ static int vlan_dev_init(struct net_device *dev)
                                           (1<<__LINK_STATE_DORMANT))) |
                       (1<<__LINK_STATE_PRESENT);
 
-        if (real_dev->features & NETIF_F_VLAN_TSO)
-                dev->features |= real_dev->features & VLAN_TSO_FEATURES;
-        if (real_dev->features & NETIF_F_VLAN_CSUM)
-                dev->features |= real_dev->features & NETIF_F_ALL_CSUM;
+        dev->features |= real_dev->features & real_dev->vlan_features;
 
         /* ipv6 shared card related stuff */
         dev->dev_id = real_dev->dev_id;