diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/net/smc911x.c | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index a8cf006c0998..e0b972d36664 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) | |||
| 498 | #else | 498 | #else |
| 499 | SMC_PUSH_DATA(lp, buf, len); | 499 | SMC_PUSH_DATA(lp, buf, len); |
| 500 | dev->trans_start = jiffies; | 500 | dev->trans_start = jiffies; |
| 501 | dev_kfree_skb(skb); | 501 | dev_kfree_skb_irq(skb); |
| 502 | #endif | 502 | #endif |
| 503 | if (!lp->tx_throttle) { | 503 | if (!lp->tx_throttle) { |
| 504 | netif_wake_queue(dev); | 504 | netif_wake_queue(dev); |