p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2014-01-18 18:27:49 -08:00 committed by David S. Miller
parent 342dfc306f
commit 3acfa1e73c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/ip_gre.c
View File

@ -278,7 +278,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb,
return NETDEV_TX_OK; return NETDEV_TX_OK;
free_skb: free_skb:
dev_kfree_skb(skb); kfree_skb(skb);
out: out:
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
return NETDEV_TX_OK; return NETDEV_TX_OK;
@ -301,7 +301,7 @@ static netdev_tx_t gre_tap_xmit(struct sk_buff *skb,
return NETDEV_TX_OK; return NETDEV_TX_OK;
free_skb: free_skb:
dev_kfree_skb(skb); kfree_skb(skb);
out: out:
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
return NETDEV_TX_OK; return NETDEV_TX_OK;

4
net/ipv4/ip_tunnel.c
View File

@ -716,7 +716,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
if (skb_cow_head(skb, dev->needed_headroom)) { if (skb_cow_head(skb, dev->needed_headroom)) {
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
dev_kfree_skb(skb); kfree_skb(skb);
return; return;
} }
@ -732,7 +732,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
#endif #endif
tx_error: tx_error:
dev->stats.tx_errors++; dev->stats.tx_errors++;
dev_kfree_skb(skb); kfree_skb(skb);
} }
EXPORT_SYMBOL_GPL(ip_tunnel_xmit); EXPORT_SYMBOL_GPL(ip_tunnel_xmit);

2
net/ipv4/ip_vti.c
View File

@ -162,7 +162,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
dst_link_failure(skb); dst_link_failure(skb);
tx_error: tx_error:
dev->stats.tx_errors++; dev->stats.tx_errors++;
dev_kfree_skb(skb); kfree_skb(skb);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }

2
net/ipv4/ipip.c
View File

@ -228,7 +228,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
tx_error: tx_error:
dev_kfree_skb(skb); kfree_skb(skb);
out: out:
dev->stats.tx_errors++; dev->stats.tx_errors++;
return NETDEV_TX_OK; return NETDEV_TX_OK;