* [PATCH net-next] net: gro: GRO_MERGED_FREE consumes packets
@ 2012-04-19 17:07 Eric Dumazet
2012-04-19 18:25 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2012-04-19 17:07 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
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>
---
net/core/dev.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index c938127..501f3cc 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: gro: GRO_MERGED_FREE consumes packets
2012-04-19 17:07 [PATCH net-next] net: gro: GRO_MERGED_FREE consumes packets Eric Dumazet
@ 2012-04-19 18:25 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-04-19 18:25 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 19 Apr 2012 19:07:40 +0200
> From: Eric Dumazet <edumazet@google.com>
>
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-19 18:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-19 17:07 [PATCH net-next] net: gro: GRO_MERGED_FREE consumes packets Eric Dumazet
2012-04-19 18:25 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).