Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

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

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index b661f47bf10a0320889f22e7e1fcf7f3496b6baa..f0e335aa20df43370d947ebbee52a23013491ae3 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -394,6 +394,7 @@ static void vlan_transfer_features(struct net_device *dev,
 
        vlandev->features &= ~dev->vlan_features;
        vlandev->features |= dev->features & dev->vlan_features;
+       vlandev->gso_max_size = dev->gso_max_size;
 
        if (old_features != vlandev->features)
                netdev_features_change(vlandev);