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

Commit b6a0e72a authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: Fix typo in netdev_intersect_features 



Obviously need to 'or in NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM.

Fixes: c8cd0989 ("net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM")
Reported-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6bd6d5fa

include/linux/netdevice.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -3873,9 +3873,9 @@ static inline netdev_features_t netdev_intersect_features(netdev_features_t f1, 
{

{

	if ((f1 ^ f2) & NETIF_F_HW_CSUM) {

	if ((f1 ^ f2) & NETIF_F_HW_CSUM) {

		if (f1 & NETIF_F_HW_CSUM)

		if (f1 & NETIF_F_HW_CSUM)

			f1 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);

			f1 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);

		else

		else

			f2 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);

			f2 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);

	}

	}





	return f1 & f2;

	return f1 & f2;