Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1180e7d6 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller
Browse files

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: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c9c1b54

net/core/dev.c

+2 −5
Original line number Diff line number Diff line
@@ -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);