diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 18:08:04 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-24 21:19:10 -0700 |
| commit | 4b61fe2621e40fb348cd4c2a592c353b43c9460b (patch) | |
| tree | 5e1dc639681818e56905381589e546304eb795d7 /drivers/net/ethernet/smsc | |
| parent | smc911x: Call dev_kfree_skb_any instead of dev_kfree_skb. (diff) | |
| download | linux-dev-4b61fe2621e40fb348cd4c2a592c353b43c9460b.tar.xz linux-dev-4b61fe2621e40fb348cd4c2a592c353b43c9460b.zip | |
smc91x: Call dev_kfree/consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in
smc_hardware_send_pkt that can be called in hard irq and other
contexts, and handles successfully transmitted packets.
Replace dev_kfree_skb with dev_kfree_skb_any in smc_hard_start_xmit which
can be called in hard irq and other contexts, and only frees skbs
when dropping them.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/smsc')
| -rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 839c0e6cca01..d1b4dca53a9d 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -621,7 +621,7 @@ static void smc_hardware_send_pkt(unsigned long data) done: if (!THROTTLE_TX_PKTS) netif_wake_queue(dev); - dev_kfree_skb(skb); + dev_consume_skb_any(skb); } /* @@ -657,7 +657,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) netdev_warn(dev, "Far too big packet error.\n"); dev->stats.tx_errors++; dev->stats.tx_dropped++; - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } |