mmc: Fix crash in mmc_block on 64-bit

[pandora-kernel.git] / net / 8021q / vlan_dev.c

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index b1cfbaa..5d055c2 100644 (file)
--- 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;