OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7426a56
)
ip6_tunnel: dont drop packet but consume it
author
Eric Dumazet
<edumazet@google.com>
Thu, 19 Apr 2012 02:24:17 +0000
(
02:24
+0000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 19 Apr 2012 18:23:55 +0000
(14:23 -0400)
When we need to reallocate skb, we dont drop a packet.
Call consume_skb() to not confuse dropwatch.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_tunnel.c
patch
|
blob
|
history
diff --git
a/net/ipv6/ip6_tunnel.c
b/net/ipv6/ip6_tunnel.c
index
e25b0fd
..
5df487c
100644
(file)
--- a/
net/ipv6/ip6_tunnel.c
+++ b/
net/ipv6/ip6_tunnel.c
@@
-954,7
+954,7
@@
static int ip6_tnl_xmit2(struct sk_buff *skb,
if (skb->sk)
skb_set_owner_w(new_skb, skb->sk);
-
kfre
e_skb(skb);
+
consum
e_skb(skb);
skb = new_skb;
}
skb_dst_drop(skb);