diff options
| author |   Scott Wood <scottwood@freescale.com> | 2014-09-10 21:23:18 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-12 17:55:41 -0400 |
| commit | 2d8f7e2c8a63131828e8d4e2d98835399f27319e (patch) | |
| tree | 6b0e954495b7b096baca4021d84bb8438ba7fc22 /net/ipv6/udp_offload.c | |
| parent | Merge branch 'sock_queue_err_skb' (diff) | |
| download | linux-dev-2d8f7e2c8a63131828e8d4e2d98835399f27319e.tar.xz linux-dev-2d8f7e2c8a63131828e8d4e2d98835399f27319e.zip | |
udp: Fix inverted NAPI_GRO_CB(skb)->flush test
Commit 2abb7cdc0d ("udp: Add support for doing checksum unnecessary
conversion") caused napi_gro_cb structs with the "flush" field zero to
take the "udp_gro_receive" path rather than the "set flush to 1" path
that they would previously take. As a result I saw booting from an NFS
root hang shortly after starting userspace, with "server not
responding" messages.
This change to the handling of "flush == 0" packets appears to be
incidental to the goal of adding new code in the case where
skb_gro_checksum_validate_zero_check() returns zero. Based on that and
the fact that it breaks things, I'm assuming that it is unintentional.
Fixes: 2abb7cdc0d ("udp: Add support for doing checksum unnecessary conversion")
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp_offload.c')
| -rw-r--r-- | net/ipv6/udp_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index a1ad34b1c4ec..de85f809bf29 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -138,7 +138,7 @@ static struct sk_buff **udp6_gro_receive(struct sk_buff **head, goto flush; /* Don't bother verifying checksum if we're going to flush anyway. */ - if (!NAPI_GRO_CB(skb)->flush) + if (NAPI_GRO_CB(skb)->flush) goto skip; if (skb_gro_checksum_validate_zero_check(skb, IPPROTO_UDP, uh->check, |