net: remove NETIF_F_NO_CSUM feature bit

Only distinct use is checking if NETIF_F_NOCACHE_COPY should be
enabled by default. The check heuristics is altered a bit here,
so it hits other people than before. The default shouldn't be
trusted for performance-critical cases anyway.

For all other uses NETIF_F_NO_CSUM is equivalent to NETIF_F_HW_CSUM.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 20e3a1f9892d..77f5202977ce 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -17,7 +17,7 @@ typedef u64 netdev_features_t;
 enum {
         NETIF_F_SG_BIT,                 /* Scatter/gather IO. */
         NETIF_F_IP_CSUM_BIT,            /* Can checksum TCP/UDP over IPv4. */
-        NETIF_F_NO_CSUM_BIT,            /* Does not require checksum. F.e. loopack. */
+        __UNUSED_NETIF_F_1,
         NETIF_F_HW_CSUM_BIT,            /* Can checksum all the packets. */
         NETIF_F_IPV6_CSUM_BIT,          /* Can checksum TCP/UDP over IPV6 */
         NETIF_F_HIGHDMA_BIT,            /* Can DMA to high memory. */
@@ -88,7 +88,6 @@ enum {
 #define NETIF_F_LRO             __NETIF_F(LRO)
 #define NETIF_F_NETNS_LOCAL     __NETIF_F(NETNS_LOCAL)
 #define NETIF_F_NOCACHE_COPY    __NETIF_F(NOCACHE_COPY)
-#define NETIF_F_NO_CSUM         __NETIF_F(NO_CSUM)
 #define NETIF_F_NTUPLE          __NETIF_F(NTUPLE)
 #define NETIF_F_RXCSUM          __NETIF_F(RXCSUM)
 #define NETIF_F_RXHASH          __NETIF_F(RXHASH)
@@ -118,7 +117,7 @@ enum {
 #define NETIF_F_GSO_SOFTWARE    (NETIF_F_TSO | NETIF_F_TSO_ECN | \
                                  NETIF_F_TSO6 | NETIF_F_UFO)
 
-#define NETIF_F_GEN_CSUM        (NETIF_F_HW_CSUM | NETIF_F_NO_CSUM)
+#define NETIF_F_GEN_CSUM        NETIF_F_HW_CSUM
 #define NETIF_F_V4_CSUM         (NETIF_F_GEN_CSUM | NETIF_F_IP_CSUM)
 #define NETIF_F_V6_CSUM         (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
 #define NETIF_F_ALL_CSUM        (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM)