Commit 9c6d5729 authored by Miaohe Lin's avatar Miaohe Lin Committed by Greg Kroah-Hartman

net: udp: Fix wrong clean up for IS_UDPLITE macro

[ Upstream commit b0a42277 ]

We can't use IS_UDPLITE to replace udp_sk->pcflag when UDPLITE_RECV_CC is
checked.

Fixes: b2bf1e26 ("[UDP]: Clean up for IS_UDPLITE macro")
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea194036
...@@ -1986,7 +1986,7 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) ...@@ -1986,7 +1986,7 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
/* /*
* UDP-Lite specific tests, ignored on UDP sockets * UDP-Lite specific tests, ignored on UDP sockets
*/ */
if ((is_udplite & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) { if ((up->pcflag & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) {
/* /*
* MIB statistics other than incrementing the error count are * MIB statistics other than incrementing the error count are
......
...@@ -606,7 +606,7 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) ...@@ -606,7 +606,7 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
/* /*
* UDP-Lite specific tests, ignored on UDP sockets (see net/ipv4/udp.c). * UDP-Lite specific tests, ignored on UDP sockets (see net/ipv4/udp.c).
*/ */
if ((is_udplite & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) { if ((up->pcflag & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) {
if (up->pcrlen == 0) { /* full coverage was set */ if (up->pcrlen == 0) { /* full coverage was set */
net_dbg_ratelimited("UDPLITE6: partial coverage %d while full coverage %d requested\n", net_dbg_ratelimited("UDPLITE6: partial coverage %d while full coverage %d requested\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment