diff options
author | Eric Dumazet <edumazet@google.com> | 2014-01-18 21:27:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-19 02:08:02 -0500 |
commit | 3acfa1e73c2a2cbf1fda7aef0c6c2c9281ce9db2 (patch) | |
tree | fe1408f38e919765475eff46fdd357be1e374f9f | |
parent | 342dfc306fb32155314dad277f3c3686b83fb9f1 (diff) |
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>
-rw-r--r-- | net/ipv4/ip_gre.c | 4 | ||||
-rw-r--r-- | net/ipv4/ip_tunnel.c | 4 | ||||
-rw-r--r-- | net/ipv4/ip_vti.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipip.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index e560ef34cf4b..e7a92fdb36f6 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -278,7 +278,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, | |||
278 | return NETDEV_TX_OK; | 278 | return NETDEV_TX_OK; |
279 | 279 | ||
280 | free_skb: | 280 | free_skb: |
281 | dev_kfree_skb(skb); | 281 | kfree_skb(skb); |
282 | out: | 282 | out: |
283 | dev->stats.tx_dropped++; | 283 | dev->stats.tx_dropped++; |
284 | return NETDEV_TX_OK; | 284 | return NETDEV_TX_OK; |
@@ -301,7 +301,7 @@ static netdev_tx_t gre_tap_xmit(struct sk_buff *skb, | |||
301 | return NETDEV_TX_OK; | 301 | return NETDEV_TX_OK; |
302 | 302 | ||
303 | free_skb: | 303 | free_skb: |
304 | dev_kfree_skb(skb); | 304 | kfree_skb(skb); |
305 | out: | 305 | out: |
306 | dev->stats.tx_dropped++; | 306 | dev->stats.tx_dropped++; |
307 | return NETDEV_TX_OK; | 307 | return NETDEV_TX_OK; |
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 432c28ab3197..83ede2e7ca42 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c | |||
@@ -716,7 +716,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, | |||
716 | 716 | ||
717 | if (skb_cow_head(skb, dev->needed_headroom)) { | 717 | if (skb_cow_head(skb, dev->needed_headroom)) { |
718 | dev->stats.tx_dropped++; | 718 | dev->stats.tx_dropped++; |
719 | dev_kfree_skb(skb); | 719 | kfree_skb(skb); |
720 | return; | 720 | return; |
721 | } | 721 | } |
722 | 722 | ||
@@ -732,7 +732,7 @@ tx_error_icmp: | |||
732 | #endif | 732 | #endif |
733 | tx_error: | 733 | tx_error: |
734 | dev->stats.tx_errors++; | 734 | dev->stats.tx_errors++; |
735 | dev_kfree_skb(skb); | 735 | kfree_skb(skb); |
736 | } | 736 | } |
737 | EXPORT_SYMBOL_GPL(ip_tunnel_xmit); | 737 | EXPORT_SYMBOL_GPL(ip_tunnel_xmit); |
738 | 738 | ||
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 0783200ad8d2..48eafae51769 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c | |||
@@ -162,7 +162,7 @@ tx_error_icmp: | |||
162 | dst_link_failure(skb); | 162 | dst_link_failure(skb); |
163 | tx_error: | 163 | tx_error: |
164 | dev->stats.tx_errors++; | 164 | dev->stats.tx_errors++; |
165 | dev_kfree_skb(skb); | 165 | kfree_skb(skb); |
166 | return NETDEV_TX_OK; | 166 | return NETDEV_TX_OK; |
167 | } | 167 | } |
168 | 168 | ||
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index fe3e9f7f1f0b..812b18351462 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -228,7 +228,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
228 | return NETDEV_TX_OK; | 228 | return NETDEV_TX_OK; |
229 | 229 | ||
230 | tx_error: | 230 | tx_error: |
231 | dev_kfree_skb(skb); | 231 | kfree_skb(skb); |
232 | out: | 232 | out: |
233 | dev->stats.tx_errors++; | 233 | dev->stats.tx_errors++; |
234 | return NETDEV_TX_OK; | 234 | return NETDEV_TX_OK; |