net: Kill NETIF_F_UFO and SKB_GSO_UDP.

No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 1d4737cffc7116c898b42787680b2e9b0dd46812..ebd2736273349f8aad1e9e8d17b916feee52a5d8 100644 (file)
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -36,7 +36,6 @@ enum {
        /**/NETIF_F_GSO_SHIFT,          /* keep the order of SKB_GSO_* bits */
        NETIF_F_TSO_BIT                 /* ... TCPv4 segmentation */
                = NETIF_F_GSO_SHIFT,
-       NETIF_F_UFO_BIT,                /* ... UDPv4 fragmentation */
        NETIF_F_GSO_ROBUST_BIT,         /* ... ->SKB_GSO_DODGY */
        NETIF_F_TSO_ECN_BIT,            /* ... TCP ECN support */
        NETIF_F_TSO_MANGLEID_BIT,       /* ... IPV4 ID mangling allowed */
@@ -118,7 +117,6 @@ enum {
 #define NETIF_F_TSO6           __NETIF_F(TSO6)
 #define NETIF_F_TSO_ECN                __NETIF_F(TSO_ECN)
 #define NETIF_F_TSO            __NETIF_F(TSO)
-#define NETIF_F_UFO            __NETIF_F(UFO)
 #define NETIF_F_VLAN_CHALLENGED        __NETIF_F(VLAN_CHALLENGED)
 #define NETIF_F_RXFCS          __NETIF_F(RXFCS)
 #define NETIF_F_RXALL          __NETIF_F(RXALL)
@@ -172,7 +170,7 @@ enum {
                                 NETIF_F_FSO)
 
 /* List of features with software fallbacks. */
-#define NETIF_F_GSO_SOFTWARE   (NETIF_F_ALL_TSO | NETIF_F_UFO | \
+#define NETIF_F_GSO_SOFTWARE   (NETIF_F_ALL_TSO | \
                                 NETIF_F_GSO_SCTP)
 
 /*

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 03b1049082359b1eba3ee87bde49bcfc799bc356..c60351b84323578cbeefd23bfd57c045d649c052 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4098,7 +4098,6 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type)
 
        /* check flags correspondence */
        BUILD_BUG_ON(SKB_GSO_TCPV4   != (NETIF_F_TSO >> NETIF_F_GSO_SHIFT));
-       BUILD_BUG_ON(SKB_GSO_UDP     != (NETIF_F_UFO >> NETIF_F_GSO_SHIFT));
        BUILD_BUG_ON(SKB_GSO_DODGY   != (NETIF_F_GSO_ROBUST >> NETIF_F_GSO_SHIFT));
        BUILD_BUG_ON(SKB_GSO_TCP_ECN != (NETIF_F_TSO_ECN >> NETIF_F_GSO_SHIFT));
        BUILD_BUG_ON(SKB_GSO_TCP_FIXEDID != (NETIF_F_TSO_MANGLEID >> NETIF_F_GSO_SHIFT));

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index dbe29b6c9bd6097b4a7e5763ad39d26921780270..4d7a284ba3ee2710d2aa2b6feded5bf988193543 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -463,39 +463,38 @@ enum {
 
 enum {
        SKB_GSO_TCPV4 = 1 << 0,
-       SKB_GSO_UDP = 1 << 1,
 
        /* This indicates the skb is from an untrusted source. */
-       SKB_GSO_DODGY = 1 << 2,
+       SKB_GSO_DODGY = 1 << 1,
 
        /* This indicates the tcp segment has CWR set. */
-       SKB_GSO_TCP_ECN = 1 << 3,
+       SKB_GSO_TCP_ECN = 1 << 2,
 
-       SKB_GSO_TCP_FIXEDID = 1 << 4,
+       SKB_GSO_TCP_FIXEDID = 1 << 3,
 
-       SKB_GSO_TCPV6 = 1 << 5,
+       SKB_GSO_TCPV6 = 1 << 4,
 
-       SKB_GSO_FCOE = 1 << 6,
+       SKB_GSO_FCOE = 1 << 5,
 
-       SKB_GSO_GRE = 1 << 7,
+       SKB_GSO_GRE = 1 << 6,
 
-       SKB_GSO_GRE_CSUM = 1 << 8,
+       SKB_GSO_GRE_CSUM = 1 << 7,
 
-       SKB_GSO_IPXIP4 = 1 << 9,
+       SKB_GSO_IPXIP4 = 1 << 8,
 
-       SKB_GSO_IPXIP6 = 1 << 10,
+       SKB_GSO_IPXIP6 = 1 << 9,
 
-       SKB_GSO_UDP_TUNNEL = 1 << 11,
+       SKB_GSO_UDP_TUNNEL = 1 << 10,
 
-       SKB_GSO_UDP_TUNNEL_CSUM = 1 << 12,
+       SKB_GSO_UDP_TUNNEL_CSUM = 1 << 11,
 
-       SKB_GSO_PARTIAL = 1 << 13,
+       SKB_GSO_PARTIAL = 1 << 12,
 
-       SKB_GSO_TUNNEL_REMCSUM = 1 << 14,
+       SKB_GSO_TUNNEL_REMCSUM = 1 << 13,
 
-       SKB_GSO_SCTP = 1 << 15,
+       SKB_GSO_SCTP = 1 << 14,
 
-       SKB_GSO_ESP = 1 << 16,
+       SKB_GSO_ESP = 1 << 15,
 };
 
 #if BITS_PER_LONG > 32