Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3acfa1e7 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv4: be friend with drop monitor 



Replace some dev_kfree_skb() with kfree_skb() calls when
we drop one skb, this might help bug tracking.

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

net/ipv4/ip_gre.c

+2 −2
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;



free_skb:

	dev_kfree_skb(skb);

	kfree_skb(skb);

out:

	dev->stats.tx_dropped++;

	return NETDEV_TX_OK;
@@ -301,7 +301,7 @@ static netdev_tx_t gre_tap_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;



free_skb:

	dev_kfree_skb(skb);

	kfree_skb(skb);

out:

	dev->stats.tx_dropped++;

	return NETDEV_TX_OK;

net/ipv4/ip_tunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, 


	if (skb_cow_head(skb, dev->needed_headroom)) {

		dev->stats.tx_dropped++;

		dev_kfree_skb(skb);

		kfree_skb(skb);

		return;

	}
@@ -732,7 +732,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, 
#endif

tx_error:

	dev->stats.tx_errors++;

	dev_kfree_skb(skb);

	kfree_skb(skb);

}

EXPORT_SYMBOL_GPL(ip_tunnel_xmit);

net/ipv4/ip_vti.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) 
	dst_link_failure(skb);

tx_error:

	dev->stats.tx_errors++;

	dev_kfree_skb(skb);

	kfree_skb(skb);

	return NETDEV_TX_OK;

}

net/ipv4/ipip.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;



tx_error:

	dev_kfree_skb(skb);

	kfree_skb(skb);

out:

	dev->stats.tx_errors++;

	return NETDEV_TX_OK;