vlan: Use bitmask of feature flags instead of seperate feature bits

Herbert Xu points out that the use of seperate feature bits for features
to be propagated to VLAN devices is going to get messy real soon.
Replace the VLAN feature bits by a bitmask of feature flags to be
propagated and restore the old GSO_SHIFT/MASK values.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 8 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);