diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-09-12 05:17:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-12 05:17:05 +0200 |
| commit | 1ae4be22f64326a6784acd7083b9590c9f4215a2 (patch) | |
| tree | 748a01af8b303d5f7d9f01234572a5fd10417495 /net/8021q | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-1ae4be22f64326a6784acd7083b9590c9f4215a2.tar.xz linux-1ae4be22f64326a6784acd7083b9590c9f4215a2.zip | |
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: 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>
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 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, 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); 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) (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; |