Commit 5d0ba55b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: use consume_skb() in place of kfree_skb() 



Remove some dropwatch/drop_monitor false positives.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4aea39c1

net/atm/lec.c

+4 −2
Original line number Diff line number Diff line
@@ -231,9 +231,11 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb, 
	if (skb_headroom(skb) < 2) {

		pr_debug("reallocating skb\n");

		skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN);

		if (unlikely(!skb2)) {

			kfree_skb(skb);

		if (skb2 == NULL)

			return NETDEV_TX_OK;

		}

		consume_skb(skb);

		skb = skb2;

	}

	skb_push(skb, 2);

net/atm/pppoatm.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb) 
				kfree_skb(n);

				goto nospace;

			}

			kfree_skb(skb);

			consume_skb(skb);

			skb = n;

			if (skb == NULL)

				return DROP_PACKET;

net/ax25/ax25_out.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ void ax25_transmit_buffer(ax25_cb *ax25, struct sk_buff *skb, int type) 
		if (skb->sk != NULL)

			skb_set_owner_w(skbn, skb->sk);



		kfree_skb(skb);

		consume_skb(skb);

		skb = skbn;

	}

net/ax25/ax25_route.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ struct sk_buff *ax25_rt_build_path(struct sk_buff *skb, ax25_address *src, 
		if (skb->sk != NULL)

			skb_set_owner_w(skbn, skb->sk);



		kfree_skb(skb);

		consume_skb(skb);



		skb = skbn;

	}

net/decnet/dn_neigh.c

+3 −3
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int dn_long_output(struct neighbour *neigh, struct sk_buff *skb) 
			kfree_skb(skb);

			return -ENOBUFS;

		}

		kfree_skb(skb);

		consume_skb(skb);

		skb = skb2;

		net_info_ratelimited("dn_long_output: Increasing headroom\n");

	}
@@ -283,7 +283,7 @@ static int dn_short_output(struct neighbour *neigh, struct sk_buff *skb) 
			kfree_skb(skb);

			return -ENOBUFS;

		}

		kfree_skb(skb);

		consume_skb(skb);

		skb = skb2;

		net_info_ratelimited("dn_short_output: Increasing headroom\n");

	}
@@ -322,7 +322,7 @@ static int dn_phase3_output(struct neighbour *neigh, struct sk_buff *skb) 
			kfree_skb(skb);

			return -ENOBUFS;

		}

		kfree_skb(skb);

		consume_skb(skb);

		skb = skb2;

		net_info_ratelimited("dn_phase3_output: Increasing headroom\n");

	}