From: Eric W. Biederman Date: Sat, 15 Mar 2014 22:29:06 +0000 (-0700) Subject: 3c509: Call dev_consume_skb_any instead of dev_kfree_skb. X-Git-Tag: firefly_0821_release~176^2~4167^2~96^2~52 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fa9524d6b5519b6e1d549cb37bbbd10587e3eae;p=firefly-linux-kernel-4.4.55.git 3c509: Call dev_consume_skb_any instead of dev_kfree_skb. Replace dev_kfree_skb with dev_consume_skb_any in el3_start_xmit as it can be called in hard irq and other contexts. dev_consume_skb_any is used as on this simple hardware the skb is consumed directly by the start_xmit function. Signed-off-by: "Eric W. Biederman" --- diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c index c53384d41c96..35df0b9e6848 100644 --- a/drivers/net/ethernet/3com/3c509.c +++ b/drivers/net/ethernet/3com/3c509.c @@ -749,7 +749,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) spin_unlock_irqrestore(&lp->lock, flags); - dev_kfree_skb (skb); + dev_consume_skb_any (skb); /* Clear the Tx status stack. */ {