Commit f9d7a118 authored by Shan Wei's avatar Shan Wei Committed by David S. Miller

net: Add GSO to vlan_features initialization

Just add GSO to vlan_features initialization, and update comments.

When we set offload features, vlan_dev_fix_features() will do more check.
In vlan_dev_fix_features(), final features is decided by
features of real device and vlan_features of real device.
Signed-off-by: default avatarShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7736d33f
...@@ -5488,11 +5488,12 @@ int register_netdevice(struct net_device *dev) ...@@ -5488,11 +5488,12 @@ int register_netdevice(struct net_device *dev)
dev->features |= NETIF_F_NOCACHE_COPY; dev->features |= NETIF_F_NOCACHE_COPY;
} }
/* Enable GRO and NETIF_F_HIGHDMA for vlans by default, /* Enable GSO, GRO and NETIF_F_HIGHDMA for vlans by default,
* vlan_dev_init() will do the dev->features check, so these features * vlan_dev_fix_features() will do the features check,
* are enabled only if supported by underlying device. * so NETIF_F_HIGHDMA feature is enabled only if supported
* by underlying device.
*/ */
dev->vlan_features |= (NETIF_F_GRO | NETIF_F_HIGHDMA); dev->vlan_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_HIGHDMA);
ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
ret = notifier_to_errno(ret); ret = notifier_to_errno(ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment