Commit 4b61fe26 authored Mar 15, 2014 by Eric W. Biederman

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" <ebiederm@xmission.com>

parent d27ab53c

drivers/net/ethernet/smsc/smc91x.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}