From: Michał Mirosław Date: Thu, 14 Jul 2011 21:41:11 +0000 (-0700) Subject: net: cleanup vlan_features setting in register_netdev X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1180e7d6599c1fb0c56a23a649a3eb37d877b9d0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git net: cleanup vlan_features setting in register_netdev vlan_features contains features inherited from underlying device. NETIF_SOFT_FEATURES are not inherited but belong to the vlan device itself (ensured in vlan_dev_fix_features()). Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller --- diff --git a/net/core/dev.c b/net/core/dev.c index 9ca15142d823..e57be0262051 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5488,12 +5488,9 @@ int register_netdevice(struct net_device *dev) dev->features |= NETIF_F_NOCACHE_COPY; } - /* Enable GSO, GRO and NETIF_F_HIGHDMA for vlans by default, - * vlan_dev_fix_features() will do the features check, - * so NETIF_F_HIGHDMA feature is enabled only if supported - * by underlying device. + /* Make NETIF_F_HIGHDMA inheritable to VLAN devices. */ - dev->vlan_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_HIGHDMA); + dev->vlan_features |= NETIF_F_HIGHDMA; ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); ret = notifier_to_errno(ret);