projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
daa8654
)
ipv4: dont drop packet in defrag but consume it
author
Eric Dumazet
<edumazet@google.com>
Thu, 19 Apr 2012 06:10:26 +0000
(06:10 +0000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 19 Apr 2012 18:25:51 +0000
(14:25 -0400)
When defragmentation is finalized, we clone a packet and kfree_skb() it.
Call consume_skb() to not confuse dropwatch, since its not a drop.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_fragment.c
patch
|
blob
|
history
diff --git
a/net/ipv4/ip_fragment.c
b/net/ipv4/ip_fragment.c
index
3727e23
..
631f596
100644
(file)
--- a/
net/ipv4/ip_fragment.c
+++ b/
net/ipv4/ip_fragment.c
@@
-569,7
+569,7
@@
static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
skb_morph(head, qp->q.fragments);
head->next = qp->q.fragments->next;
-
kfre
e_skb(qp->q.fragments);
+
consum
e_skb(qp->q.fragments);
qp->q.fragments = head;
}