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

[linux-2.6-omap-h63xx.git] / net / 8021q / vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 51961300b586a578445c462ec73c8cf25fddaaa3..ab2225da0ee292e6931fa5faedeb7b3962e4e7d0 100644 (file)
--- 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);