diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-29 11:57:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-29 11:57:15 +0300 |
| commit | 9b963e5d0e01461099a40117b05480f24b63381f (patch) | |
| tree | 4756d554e37bf4ab7202f2c564cbe629af98b576 /drivers/net/macvlan.c | |
| parent | 3b8626ba01a8a745a3fdf22dd347edd708b0af13 (diff) | |
| parent | 5fdd4baef6195a1f2960e901c8877e2105f832ca (diff) | |
| download | linux-9b963e5d0e01461099a40117b05480f24b63381f.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 322112c7358a..93c3e6edf702 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -446,6 +446,7 @@ static int macvlan_init(struct net_device *dev) dev->state = (dev->state & ~MACVLAN_STATE_MASK) | (lowerdev->state & MACVLAN_STATE_MASK); dev->features = lowerdev->features & MACVLAN_FEATURES; + dev->gso_max_size = lowerdev->gso_max_size; dev->iflink = lowerdev->ifindex; dev->hard_header_len = lowerdev->hard_header_len; @@ -772,6 +773,7 @@ static int macvlan_device_event(struct notifier_block *unused, case NETDEV_FEAT_CHANGE: list_for_each_entry(vlan, &port->vlans, list) { vlan->dev->features = dev->features & MACVLAN_FEATURES; + vlan->dev->gso_max_size = dev->gso_max_size; netdev_features_change(vlan->dev); } break; |