From e21106b41209c57d0138b43732d623595d529455 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Mon, 24 Mar 2014 21:18:40 -0700 Subject: am79c961a: Call dev_consume_skb_any instead of dev_kfree_skb. Replace dev_kfree_skb with dev_consume_skb_any in am79c961 that can be called in hard irq and other contexts. dev_consume_skb_any is used as am79c961_sendpacket always immediately consumes the skb. Signed-off-by: "Eric W. Biederman" --- drivers/net/ethernet/amd/am79c961a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c index 9793767996a2..87e727b921dc 100644 --- a/drivers/net/ethernet/amd/am79c961a.c +++ b/drivers/net/ethernet/amd/am79c961a.c @@ -472,7 +472,7 @@ am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev) if (am_readword(dev, priv->txhdr + (priv->txhead << 3) + 2) & TMD_OWN) netif_stop_queue(dev); - dev_kfree_skb(skb); + dev_consume_skb_any(skb); return NETDEV_TX_OK; } -- cgit v1.2.3-59-g8ed1b