Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ae4be22 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

vlan: vlan device not reading gso max size of parent. 



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: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f07553a

net/8021q/vlan.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

net/8021q/vlan_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -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;