Commit daa86548 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: gro: GRO_MERGED_FREE consumes packets

As part of GRO processing, merged skbs should be consumed, not freed, to
not confuse dropwatch/drop_monitor.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85bb2a60
...@@ -3542,10 +3542,13 @@ gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb) ...@@ -3542,10 +3542,13 @@ gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
break; break;
case GRO_DROP: case GRO_DROP:
case GRO_MERGED_FREE:
kfree_skb(skb); kfree_skb(skb);
break; break;
case GRO_MERGED_FREE:
consume_skb(skb);
break;
case GRO_HELD: case GRO_HELD:
case GRO_MERGED: case GRO_MERGED:
break; break;
......
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