Skip to content

Commit

Permalink
vlan: vlan device not reading gso max size of parent.
Browse files Browse the repository at this point in the history
The vlan devices are not reading the gso max size of the parent device.  As
a result devices that do not support 64K max gso size are currently
failing.

This issue is seen on 2.6.26 kernels as well and the same patch should be
able to be applied without any issues.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alexander Duyck authored and David S. Miller committed Sep 12, 2008
1 parent 1f07553 commit 1ae4be2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions net/8021q/vlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions net/8021q/vlan_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,7 @@ static int vlan_dev_init(struct net_device *dev)
(1<<__LINK_STATE_PRESENT);

dev->features |= real_dev->features & real_dev->vlan_features;
dev->gso_max_size = real_dev->gso_max_size;

/* ipv6 shared card related stuff */
dev->dev_id = real_dev->dev_id;
Expand Down

0 comments on commit 1ae4be2

Please sign in to comment.