diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-27 18:48:56 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-27 18:48:56 -0700 |
commit | 8e8e43843ba3ced0c657cbc0fdb10644ec60f772 (patch) | |
tree | e64954326ced9c365c52c256f01b5f9fb1bcae66 /drivers/net/s2io.c | |
parent | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (diff) | |
parent | 50fd4407b8bfbde7c1a0bfe4f24de7df37164342 (diff) | |
download | linux-3.10-8e8e43843ba3ced0c657cbc0fdb10644ec60f772.tar.gz linux-3.10-8e8e43843ba3ced0c657cbc0fdb10644ec60f772.tar.bz2 linux-3.10-8e8e43843ba3ced0c657cbc0fdb10644ec60f772.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/rndis_host.c
drivers/net/wireless/b43/dma.c
net/ipv6/ndisc.c
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 86f1228c9fe..268a288e045 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -4345,6 +4345,9 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; spin_unlock_irqrestore(&fifo->tx_lock, flags); + if (sp->config.intr_type == MSI_X) + tx_intr_handler(fifo); + return 0; pci_map_failed: stats->pci_map_fail_cnt++; |