dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2012-04-19 07:07:40 +00:00 committed by David S. Miller
parent 85bb2a60fa
commit daa8654828
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/core/dev.c
View File

@ -3542,10 +3542,13 @@ gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
break;
case GRO_DROP:
case GRO_MERGED_FREE:
kfree_skb(skb);
break;
case GRO_MERGED_FREE:
consume_skb(skb);
break;
case GRO_HELD:
case GRO_MERGED:
break;