diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 16:45:46 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-24 21:18:58 -0700 |
| commit | d6bea829ca783d96087a71990d9298583c81d8b0 (patch) | |
| tree | 6988083f4fcefdd4700f047cee93212aa54d1619 /drivers/net/ethernet/cirrus | |
| parent | 42ffda5fe704ab6a3ef8ca36b5f958a3cd86a164 (diff) | |
| download | linux-d6bea829ca783d96087a71990d9298583c81d8b0.tar.bz2 | |
cs89x0: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in net_send_packet that
can be called in hard irq and other contexts.
net_send_packet consumes (not drops) the skb of interest.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/cirrus')
| -rw-r--r-- | drivers/net/ethernet/cirrus/cs89x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index 19f642a45f40..fe84fbabc0d4 100644 --- a/drivers/net/ethernet/cirrus/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c @@ -1174,7 +1174,7 @@ static netdev_tx_t net_send_packet(struct sk_buff *skb, struct net_device *dev) writewords(lp, TX_FRAME_PORT, skb->data, (skb->len + 1) >> 1); spin_unlock_irqrestore(&lp->lock, flags); dev->stats.tx_bytes += skb->len; - dev_kfree_skb(skb); + dev_consume_skb_any(skb); /* We DO NOT call netif_wake_queue() here. * We also DO NOT call netif_start_queue(). |