| From 081ba38a389c71a2fc66e29922bce52a880d20af Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 12 Sep 2023 09:17:29 +0000 |
| Subject: udplite: remove UDPLITE_BIT |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| [ 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> |
| --- |
| include/linux/udp.h | 5 ++--- |
| net/ipv4/udplite.c | 1 - |
| net/ipv6/udplite.c | 1 - |
| 3 files changed, 2 insertions(+), 5 deletions(-) |
| |
| diff --git a/include/linux/udp.h b/include/linux/udp.h |
| index 0cf83270a4a28..58156edec0096 100644 |
| --- 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 39ecdad1b50ce..af37af3ab727b 100644 |
| --- 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 267d491e97075..a60bec9b14f14 100644 |
| --- 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; |
| -- |
| 2.42.0 |
| |
