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

Commit 2adb956b authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

vlan: Warn the user if lowerdev has bad vlan features. 



Some drivers incorrectly assign vlan acceleration features to
vlan_features thus causing issues for Q-in-Q vlan configurations.
Warn the user of such cases.

Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f8c707b

include/linux/netdev_features.h

+7 −0
Original line number Diff line number Diff line
@@ -163,4 +163,11 @@ enum { 
/* changeable features with no special hardware requirements */

#define NETIF_F_SOFT_FEATURES	(NETIF_F_GSO | NETIF_F_GRO)



#define NETIF_F_VLAN_FEATURES	(NETIF_F_HW_VLAN_CTAG_FILTER | \

				 NETIF_F_HW_VLAN_CTAG_RX | \

				 NETIF_F_HW_VLAN_CTAG_TX | \

				 NETIF_F_HW_VLAN_STAG_FILTER | \

				 NETIF_F_HW_VLAN_STAG_RX | \

				 NETIF_F_HW_VLAN_STAG_TX)



#endif	/* _LINUX_NETDEV_FEATURES_H */

net/8021q/vlan_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -578,6 +578,9 @@ static int vlan_dev_init(struct net_device *dev) 


	dev->features |= real_dev->vlan_features | NETIF_F_LLTX;

	dev->gso_max_size = real_dev->gso_max_size;

	if (dev->features & NETIF_F_VLAN_FEATURES)

		netdev_warn(real_dev, "VLAN features are set incorrectly.  Q-in-Q configurations may not work correctly.\n");





	/* ipv6 shared card related stuff */

	dev->dev_id = real_dev->dev_id;