From: Eric Dumazet <edumazet@google.com>
Date: Thu, 19 Apr 2012 02:24:17 +0000 (+0000)
Subject: ip6_tunnel: dont drop packet but consume it
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9ff264492ffa2ac90698e1806bf27e716a99fee8;p=deliverable%2Flinux.git

ip6_tunnel: dont drop packet but consume it

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>
---

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index e25b0fdd935c..5df487c81ed9 100644
--- 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);
-		kfree_skb(skb);
+		consume_skb(skb);
 		skb = new_skb;
 	}
 	skb_dst_drop(skb);