From: Eric W. Biederman Date: Sun, 16 Mar 2014 01:08:04 +0000 (-0700) Subject: smc91x: Call dev_kfree/consume_skb_any instead of dev_kfree_skb. X-Git-Tag: v3.15-rc1~113^2~96^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b61fe2621e40fb348cd4c2a592c353b43c9460b;p=platform%2Fkernel%2Flinux-exynos.git smc91x: Call dev_kfree/consume_skb_any instead of dev_kfree_skb. Replace dev_kfree_skb with dev_consume_skb_any in smc_hardware_send_pkt that can be called in hard irq and other contexts, and handles successfully transmitted packets. Replace dev_kfree_skb with dev_kfree_skb_any in smc_hard_start_xmit which can be called in hard irq and other contexts, and only frees skbs when dropping them. Signed-off-by: "Eric W. Biederman" --- diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 839c0e6..d1b4dca 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -621,7 +621,7 @@ static void smc_hardware_send_pkt(unsigned long data) done: if (!THROTTLE_TX_PKTS) netif_wake_queue(dev); - dev_kfree_skb(skb); + dev_consume_skb_any(skb); } /* @@ -657,7 +657,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) netdev_warn(dev, "Far too big packet error.\n"); dev->stats.tx_errors++; dev->stats.tx_dropped++; - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; }