diff options
author | Brandon Philips <bphilips@suse.de> | 2010-09-15 05:24:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-16 01:32:29 -0400 |
commit | 16c3ea785fe4a383c6675dfe7316f3c815755bdd (patch) | |
tree | 4eeae9f3d64d53ffa30acf0223df70acb1e2a253 | |
parent | b1cbd5f980863eb97f687baba95850c334c83a47 (diff) |
net: enable GRO by default for vlan devices
Currently vlan devices don't have GRO by default as none of the Ethernet
drivers add NETIF_F_GRO to their vlan_features.
As GRO is a software feature add GRO to dev->vlan_features in
register_netdevice() and let vlan_dev_init() take care that it gets
enabled only when dev->features has NETIF_F_GRO too.
Signed-off-by: Brandon Philips <bphilips@suse.de>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 5bdce97b8175..09b3742c4c89 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -5057,6 +5057,11 @@ int register_netdevice(struct net_device *dev) | |||
5057 | if (dev->features & NETIF_F_SG) | 5057 | if (dev->features & NETIF_F_SG) |
5058 | dev->features |= NETIF_F_GSO; | 5058 | dev->features |= NETIF_F_GSO; |
5059 | 5059 | ||
5060 | /* Enable GRO for vlans by default if dev->features has GRO also. | ||
5061 | * vlan_dev_init() will do the dev->features check. | ||
5062 | */ | ||
5063 | dev->vlan_features |= NETIF_F_GRO; | ||
5064 | |||
5060 | ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); | 5065 | ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); |
5061 | ret = notifier_to_errno(ret); | 5066 | ret = notifier_to_errno(ret); |
5062 | if (ret) | 5067 | if (ret) |