diff options
| -rw-r--r-- | net/core/dev.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9ca15142d82..e57be026205 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); |