openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shan Wei 2011-07-05 20:44:17 -07:00 committed by David S. Miller
parent 7736d33f42
commit f9d7a1187d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/core/dev.c
View File

@ -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);