Commit b1dc497b authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

net: Fix netdev_fix_features so that TSO_MANGLEID is only available with TSO 



This change makes it so that we will strip the TSO_MANGLEID bit if TSO is
not present.  This way we will also handle ECN correctly of TSO is not
present.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36c98382

net/core/dev.c

+4 −0
Original line number Diff line number Diff line
@@ -6721,6 +6721,10 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, 
		features &= ~NETIF_F_TSO6;

	}



	/* TSO with IPv4 ID mangling requires IPv4 TSO be enabled */

	if ((features & NETIF_F_TSO_MANGLEID) && !(features & NETIF_F_TSO))

		features &= ~NETIF_F_TSO_MANGLEID;



	/* TSO ECN requires that TSO is present as well. */

	if ((features & NETIF_F_ALL_TSO) == NETIF_F_TSO_ECN)

		features &= ~NETIF_F_TSO_ECN;