udplite: remove UDPLITE_BIT

[ Upstream commit 729549aa350c56a777bb342941ed4d69b6585769 ]

This flag is set but never read, we can remove it.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Stable-dep-of: 882af43a0fc3 ("udplite: fix various data-races")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/linux/udp.h b/include/linux/udp.h
index 0cf8327..58156ed 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -55,9 +55,8 @@ struct udp_sock {
        __u8             encap_type;    /* Is this an Encapsulation socket? */
 
 /* indicator bits used by pcflag: */
-#define UDPLITE_BIT      0x1           /* set by udplite proto init function */
-#define UDPLITE_SEND_CC  0x2           /* set via udplite setsockopt         */
-#define UDPLITE_RECV_CC  0x4           /* set via udplite setsocktopt        */
+#define UDPLITE_SEND_CC  0x1           /* set via udplite setsockopt         */
+#define UDPLITE_RECV_CC  0x2           /* set via udplite setsocktopt        */
        __u8             pcflag;        /* marks socket as UDP-Lite if > 0    */
        /*
         * Following member retains the information to create a UDP header

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 39ecdad..af37af3 100644 (file)
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -21,7 +21,6 @@ EXPORT_SYMBOL(udplite_table);
 static int udplite_sk_init(struct sock *sk)
 {
        udp_init_sock(sk);
-       udp_sk(sk)->pcflag = UDPLITE_BIT;
        pr_warn_once("UDP-Lite is deprecated and scheduled to be removed in 2025, "
                     "please contact the netdev mailing list\n");
        return 0;

diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 267d491..a60bec9 100644 (file)
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -17,7 +17,6 @@
 static int udplitev6_sk_init(struct sock *sk)
 {
        udpv6_init_sock(sk);
-       udp_sk(sk)->pcflag = UDPLITE_BIT;
        pr_warn_once("UDP-Lite is deprecated and scheduled to be removed in 2025, "
                     "please contact the netdev mailing list\n");
        return 0;