aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 2c7934f8cf3..e0c0b86f57a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5058,10 +5058,11 @@ int register_netdevice(struct net_device *dev)
5058 if (dev->features & NETIF_F_SG) 5058 if (dev->features & NETIF_F_SG)
5059 dev->features |= NETIF_F_GSO; 5059 dev->features |= NETIF_F_GSO;
5060 5060
5061 /* Enable GRO for vlans by default if dev->features has GRO also. 5061 /* Enable GRO and NETIF_F_HIGHDMA for vlans by default,
5062 * vlan_dev_init() will do the dev->features check. 5062 * vlan_dev_init() will do the dev->features check, so these features
5063 * are enabled only if supported by underlying device.
5063 */ 5064 */
5064 dev->vlan_features |= NETIF_F_GRO; 5065 dev->vlan_features |= (NETIF_F_GRO | NETIF_F_HIGHDMA);
5065 5066
5066 ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); 5067 ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
5067 ret = notifier_to_errno(ret); 5068 ret = notifier_to_errno(ret);