[VLAN]: Propagate selected feature bits to VLAN devices

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

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index c961f0826005bc196c90c687a41297e6860d8c6b..b1cfbaa88db26dbeed4a68a3b26a79f0d46213bf 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -663,6 +663,11 @@ 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;
+
        /* ipv6 shared card related stuff */
        dev->dev_id = real_dev->dev_id;