summaryrefslogtreecommitdiffstats
path: root/drivers/net/smc911x.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-06 22:43:03 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-06 22:43:03 -0800
commit9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch)
tree3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/net/smc911x.c
parent61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff)
parent4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff)
downloadop-kernel-dev-9eeda9abd1faf489f3df9a1f557975f4c8650363.zip
op-kernel-dev-9eeda9abd1faf489f3df9a1f557975f4c8650363.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath5k/base.c net/8021q/vlan_core.c
Diffstat (limited to 'drivers/net/smc911x.c')
-rw-r--r--drivers/net/smc911x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index a8cf006..e0b972d 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -498,7 +498,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev)
#else
SMC_PUSH_DATA(lp, buf, len);
dev->trans_start = jiffies;
- dev_kfree_skb(skb);
+ dev_kfree_skb_irq(skb);
#endif
if (!lp->tx_throttle) {
netif_wake_queue(dev);
OpenPOWER on IntegriCloud