diff options
| author | Divy Le Ray <divy@chelsio.com> | 2007-05-30 10:01:34 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-06-20 19:16:58 -0400 |
| commit | 890de332834a95450a74e5f615f4f9a0fa564623 (patch) | |
| tree | 555e87ff623f98f74741ece661b7928d2bb14e08 /drivers/net | |
| parent | e360b5628f1d040c0e96dd9ee011196645e08aef (diff) | |
| download | kernel_samsung_aries-890de332834a95450a74e5f615f4f9a0fa564623.zip kernel_samsung_aries-890de332834a95450a74e5f615f4f9a0fa564623.tar.gz kernel_samsung_aries-890de332834a95450a74e5f615f4f9a0fa564623.tar.bz2 | |
cxgb3 - fix netpoll hanlder
Fix netpoll handler to work with line interrupt, msi and msi-x.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 16 | ||||
| -rw-r--r-- | drivers/net/cxgb3/sge.c | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 1b20f40..d8a1f54 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -2071,10 +2071,20 @@ static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp) static void cxgb_netpoll(struct net_device *dev) { struct adapter *adapter = dev->priv; - struct sge_qset *qs = dev2qset(dev); + struct port_info *pi = netdev_priv(dev); + int qidx; - t3_intr_handler(adapter, qs->rspq.polling) (adapter->pdev->irq, - adapter); + for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) { + struct sge_qset *qs = &adapter->sge.qs[qidx]; + void *source; + + if (adapter->flags & USING_MSIX) + source = qs; + else + source = adapter; + + t3_intr_handler(adapter, qs->rspq.polling) (0, source); + } } #endif diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index eaa7dac..a60ec4d 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c @@ -2217,7 +2217,6 @@ irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie) struct sge_rspq *q = &qs->rspq; spin_lock(&q->lock); - BUG_ON(napi_is_scheduled(qs->netdev)); if (handle_responses(adap, q) < 0) q->unhandled_irqs++; |