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

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

netdev_features: Fold NETIF_F_ALL_TSO into NETIF_F_GSO_SOFTWARE 



This patch folds NETIF_F_ALL_TSO into the bitmask for NETIF_F_GSO_SOFTWARE.
The idea is to avoid duplication of defines since the only difference
between the two was the GSO_UDP bit.

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

include/linux/netdev_features.h

+3 −5
Original line number Diff line number Diff line
@@ -152,11 +152,6 @@ enum { 
#define NETIF_F_GSO_MASK	(__NETIF_F_BIT(NETIF_F_GSO_LAST + 1) - \

		__NETIF_F_BIT(NETIF_F_GSO_SHIFT))



/* List of features with software fallbacks. */

#define NETIF_F_GSO_SOFTWARE	(NETIF_F_TSO | NETIF_F_TSO_ECN | \

				 NETIF_F_TSO_MANGLEID | \

				 NETIF_F_TSO6 | NETIF_F_UFO)



/* List of IP checksum features. Note that NETIF_F_ HW_CSUM should not be

 * set in features when NETIF_F_IP_CSUM or NETIF_F_IPV6_CSUM are set--

 * this would be contradictory
@@ -170,6 +165,9 @@ enum { 
#define NETIF_F_ALL_FCOE	(NETIF_F_FCOE_CRC | NETIF_F_FCOE_MTU | \

				 NETIF_F_FSO)



/* List of features with software fallbacks. */

#define NETIF_F_GSO_SOFTWARE	(NETIF_F_ALL_TSO | NETIF_F_UFO)



/*

 * If one device supports one of these features, then enable them

 * for all in netdev_increment_features.