ipv6: call consume_skb() in frag/reassembly

Some kfree_skb() calls should be replaced by consume_skb() to avoid
drop_monitor/dropwatch false positives.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index b7ca46161cb9b587d02c056f3236ae5725bf21f5..b347062aa8090fa7a0dd7f4d78b82c5bb9078d07 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -210,7 +210,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
                                kfree_skb(skb);
                                return -ENOBUFS;
                        }
-                       kfree_skb(skb);
+                       consume_skb(skb);
                        skb = skb2;
                        skb_set_owner_w(skb, sk);
                }
@@ -889,7 +889,7 @@ slow_path:
        }
        IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
                      IPSTATS_MIB_FRAGOKS);
-       kfree_skb(skb);
+       consume_skb(skb);
        return err;
 
 fail:

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 36e04cff1a85062178ee30fcc65f6300d824e852..54c5d2b704dfb819db326f12156b2c8b1b83a73b 100644 (file)
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -433,7 +433,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
                skb_morph(head, fq->q.fragments);
                head->next = fq->q.fragments->next;
 
-               kfree_skb(fq->q.fragments);
+               consume_skb(fq->q.fragments);
                fq->q.fragments = head;
        }