diff options
author | Eric Dumazet <edumazet@google.com> | 2016-03-17 00:59:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-17 21:05:01 -0400 |
commit | f6773c5e95a6dc1af82157d4e96e412dee3abf31 (patch) | |
tree | e43a5b3cb883fc7b9aebf126240fde78bcabf2f7 /net/8021q | |
parent | b4ab9d76b9e4a2ef36821b93b4cee48e3e68fe93 (diff) |
vlan: propagate gso_max_segs
vlan drivers lack proper propagation of gso_max_segs from
lower device.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-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 69929c05c843..a1e273af6fc8 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -311,6 +311,7 @@ static void vlan_transfer_features(struct net_device *dev, | |||
311 | struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev); | 311 | struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev); |
312 | 312 | ||
313 | vlandev->gso_max_size = dev->gso_max_size; | 313 | vlandev->gso_max_size = dev->gso_max_size; |
314 | vlandev->gso_max_segs = dev->gso_max_segs; | ||
314 | 315 | ||
315 | if (vlan_hw_offload_capable(dev->features, vlan->vlan_proto)) | 316 | if (vlan_hw_offload_capable(dev->features, vlan->vlan_proto)) |
316 | vlandev->hard_header_len = dev->hard_header_len; | 317 | vlandev->hard_header_len = dev->hard_header_len; |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index e416a4038a12..e7e62570bdb8 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -551,6 +551,7 @@ static int vlan_dev_init(struct net_device *dev) | |||
551 | dev->features |= real_dev->vlan_features | NETIF_F_LLTX | | 551 | dev->features |= real_dev->vlan_features | NETIF_F_LLTX | |
552 | NETIF_F_GSO_SOFTWARE; | 552 | NETIF_F_GSO_SOFTWARE; |
553 | dev->gso_max_size = real_dev->gso_max_size; | 553 | dev->gso_max_size = real_dev->gso_max_size; |
554 | dev->gso_max_segs = real_dev->gso_max_segs; | ||
554 | if (dev->features & NETIF_F_VLAN_FEATURES) | 555 | if (dev->features & NETIF_F_VLAN_FEATURES) |
555 | netdev_warn(real_dev, "VLAN features are set incorrectly. Q-in-Q configurations may not work correctly.\n"); | 556 | netdev_warn(real_dev, "VLAN features are set incorrectly. Q-in-Q configurations may not work correctly.\n"); |
556 | 557 | ||