diff options
-rw-r--r-- | net/8021q/vlan.c | 1 | ||||
-rw-r--r-- | net/8021q/vlan_dev.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index b661f47bf10a..f0e335aa20df 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -394,6 +394,7 @@ static void vlan_transfer_features(struct net_device *dev, | |||
394 | 394 | ||
395 | vlandev->features &= ~dev->vlan_features; | 395 | vlandev->features &= ~dev->vlan_features; |
396 | vlandev->features |= dev->features & dev->vlan_features; | 396 | vlandev->features |= dev->features & dev->vlan_features; |
397 | vlandev->gso_max_size = dev->gso_max_size; | ||
397 | 398 | ||
398 | if (old_features != vlandev->features) | 399 | if (old_features != vlandev->features) |
399 | netdev_features_change(vlandev); | 400 | netdev_features_change(vlandev); |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 4bf014e51f8c..97688cdb5501 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -607,6 +607,7 @@ static int vlan_dev_init(struct net_device *dev) | |||
607 | (1<<__LINK_STATE_PRESENT); | 607 | (1<<__LINK_STATE_PRESENT); |
608 | 608 | ||
609 | dev->features |= real_dev->features & real_dev->vlan_features; | 609 | dev->features |= real_dev->features & real_dev->vlan_features; |
610 | dev->gso_max_size = real_dev->gso_max_size; | ||
610 | 611 | ||
611 | /* ipv6 shared card related stuff */ | 612 | /* ipv6 shared card related stuff */ |
612 | dev->dev_id = real_dev->dev_id; | 613 | dev->dev_id = real_dev->dev_id; |