2 files changed, 13 insertions, 4 deletions

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 1b20f4060e2d..d8a1f5452c51 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 eaa7dace4182..a60ec4d4707c 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++;