diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 15:31:09 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-24 15:17:22 -0700 |
| commit | e5ddf351b1b10a1da6b76176f4e1fdce09f90892 (patch) | |
| tree | 3d4439f94cd83ce9e55e17fcd9e2f3f022e04dda /drivers/net/ethernet/3com | |
| parent | 8fa9524d6b5519b6e1d549cb37bbbd10587e3eae (diff) | |
| download | linux-e5ddf351b1b10a1da6b76176f4e1fdce09f90892.tar.bz2 | |
3c59x: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in vortex_start_xmit
as it can be called in hard irq and other contexts.
dev_consume_skb_any is used when vortext_start_xmit directly consumes
the packet instead of dmaing it to the device.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/3com')
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 238ccea965c8..61477b8e8d24 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c @@ -2086,7 +2086,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) /* ... and the packet rounded to a doubleword. */ skb_tx_timestamp(skb); iowrite32_rep(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); - dev_kfree_skb (skb); + dev_consume_skb_any (skb); if (ioread16(ioaddr + TxFree) > 1536) { netif_start_queue (dev); /* AKPM: redundant? */ } else { |