summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric Dumazet2012-04-19 04:24:36 +0200
committerDavid S. Miller2012-04-19 20:23:55 +0200
commitab185d7b2551e9b8d946a657ddccd86d192bebd1 (patch)
tree660b4772773143b35fda8915ad0dcf783f021aaf /net/ipv6
parentnetlink: dont drop packet but consume it (diff)
downloadkernel-qcow2-linux-ab185d7b2551e9b8d946a657ddccd86d192bebd1.tar.gz
kernel-qcow2-linux-ab185d7b2551e9b8d946a657ddccd86d192bebd1.tar.xz
kernel-qcow2-linux-ab185d7b2551e9b8d946a657ddccd86d192bebd1.zip
ipv6: tcp: dont drop packet but consume it
When we need to clone 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>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 86cfe6005f40..050c55186bc4 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1353,7 +1353,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
newnp->pktoptions = NULL;
if (treq->pktopts != NULL) {
newnp->pktoptions = skb_clone(treq->pktopts, GFP_ATOMIC);
- kfree_skb(treq->pktopts);
+ consume_skb(treq->pktopts);
treq->pktopts = NULL;
if (newnp->pktoptions)
skb_set_owner_r(newnp->pktoptions, newsk);