net: Rename NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK
The name NETIF_F_ALL_CSUM is a misnomer. This does not correspond to the set of features for offloading all checksums. This is a mask of the checksum offload related features bits. It is incorrect to set both NETIF_F_HW_CSUM and NETIF_F_IP_CSUM or NETIF_F_IPV6 at the same time for features of a device. This patch: - Changes instances of NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK (where NETIF_F_ALL_CSUM is being used as a mask). - Changes bonding, sfc/efx, ipvlan, macvlan, vlan, and team drivers to use NEITF_F_HW_CSUM in features list instead of NETIF_F_ALL_CSUM. Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
253aab0597
commit
a188222b6e
@@ -3763,12 +3763,12 @@ static inline netdev_features_t netdev_intersect_features(netdev_features_t f1,
|
||||
netdev_features_t f2)
|
||||
{
|
||||
if (f1 & NETIF_F_GEN_CSUM)
|
||||
f1 |= (NETIF_F_ALL_CSUM & ~NETIF_F_GEN_CSUM);
|
||||
f1 |= (NETIF_F_CSUM_MASK & ~NETIF_F_GEN_CSUM);
|
||||
if (f2 & NETIF_F_GEN_CSUM)
|
||||
f2 |= (NETIF_F_ALL_CSUM & ~NETIF_F_GEN_CSUM);
|
||||
f2 |= (NETIF_F_CSUM_MASK & ~NETIF_F_GEN_CSUM);
|
||||
f1 &= f2;
|
||||
if (f1 & NETIF_F_GEN_CSUM)
|
||||
f1 &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_GEN_CSUM);
|
||||
f1 &= ~(NETIF_F_CSUM_MASK & ~NETIF_F_GEN_CSUM);
|
||||
|
||||
return f1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user