History

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.

Eric Dumazet committed 12 years ago

Commit 3acfa1e1 parent 342dfc34 files · +6 −6Browse files

Unified · Split

4 files
  1. net/ipv4/ip_gre.c +2 −2
  2. net/ipv4/ip_tunnel.c +2 −2
  3. net/ipv4/ip_vti.c +1 −1
  4. net/ipv4/ipip.c +1 −1
net/ipv4/ip_gre.c+2−2
@@ -278,7 +278,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, · 277 unmodified lines
278278 return NETDEV_TX_OK;
279279
280280 free_skb:
281− dev_kfree_skb(skb);
281+ kfree_skb(skb);
282282 out:
283283 dev->stats.tx_dropped++;
284284 return NETDEV_TX_OK;
@@ -301,7 +301,7 @@ static netdev_tx_t gre_tap_xmit(struct sk_buff *skb, · 16 unmodified lines
301301 return NETDEV_TX_OK;
302302
303303 free_skb:
304− dev_kfree_skb(skb);
304+ kfree_skb(skb);
305305 out:
306306 dev->stats.tx_dropped++;
307307 return NETDEV_TX_OK;
net/ipv4/ip_tunnel.c+2−2
@@ -716,7 +716,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, · 715 unmodified lines
716716
717717 if (skb_cow_head(skb, dev->needed_headroom)) {
718718 dev->stats.tx_dropped++;
719− dev_kfree_skb(skb);
719+ kfree_skb(skb);
720720 return;
721721 }
722722
@@ -732,7 +732,7 @@ tx_error_icmp: · 9 unmodified lines
732732 #endif
733733 tx_error:
734734 dev->stats.tx_errors++;
735− dev_kfree_skb(skb);
735+ kfree_skb(skb);
736736 }
737737 EXPORT_SYMBOL_GPL(ip_tunnel_xmit);
738738
net/ipv4/ip_vti.c+1−1
@@ -162,7 +162,7 @@ tx_error_icmp: · 161 unmodified lines
162162 dst_link_failure(skb);
163163 tx_error:
164164 dev->stats.tx_errors++;
165− dev_kfree_skb(skb);
165+ kfree_skb(skb);
166166 return NETDEV_TX_OK;
167167 }
168168
net/ipv4/ipip.c+1−1
@@ -228,7 +228,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) · 227 unmodified lines
228228 return NETDEV_TX_OK;
229229
230230 tx_error:
231− dev_kfree_skb(skb);
231+ kfree_skb(skb);
232232 out:
233233 dev->stats.tx_errors++;
234234 return NETDEV_TX_OK;