summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/allwinner
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-24 21:13:02 -0700
committerEric W. Biederman <ebiederm@xmission.com>2014-03-24 21:15:53 -0700
commitc99abc8b39d8281dad04d771bb7a2de36fec4d9f (patch)
tree188ee01d6ba2703e1491ee54cb315523932bfe34 /drivers/net/ethernet/allwinner
parent21534d20fe6f7108f7f4eaaf47f138e20e6c85c9 (diff)
downloadtalos-op-linux-c99abc8b39d8281dad04d771bb7a2de36fec4d9f.tar.gz
talos-op-linux-c99abc8b39d8281dad04d771bb7a2de36fec4d9f.zip
sun4i-emac: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in emacs_start_xmit which can be called in hard irq and other contexts. emac_start_xmit always transmits the packet making dev_consume_skb the appropriate function to call. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/allwinner')
-rw-r--r--drivers/net/ethernet/allwinner/sun4i-emac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 511f6eecd58b..fcaeeb8a4929 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -476,7 +476,7 @@ static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&db->lock, flags);
/* free this SKB */
- dev_kfree_skb(skb);
+ dev_consume_skb_any(skb);
return NETDEV_TX_OK;
}
OpenPOWER on IntegriCloud