bnx2: fix poll_controller to pass proper structures and check all rx queues
authorNeil Horman <nhorman@tuxdriver.com>
Thu, 13 Nov 2008 00:23:44 +0000 (16:23 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Nov 2008 00:23:44 +0000 (16:23 -0800)
Fix bnx2 so that netpoll works properly.  Specifically:

1) Fix parameters to bnx2_interrupt to be a struct bnx2_napi rather than a
struct net_device

2) Fix poll_controller method to check every queue in the rx case so frames
aren't missed

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2.c

index 430d430bce29e8f3f6f03a37753579c140ff2e8e..d07e3f1489510642c0cde8b41b96875fdc115c92 100644 (file)
@@ -7204,10 +7204,13 @@ static void
 poll_bnx2(struct net_device *dev)
 {
        struct bnx2 *bp = netdev_priv(dev);
+       int i;
 
-       disable_irq(bp->pdev->irq);
-       bnx2_interrupt(bp->pdev->irq, dev);
-       enable_irq(bp->pdev->irq);
+       for (i = 0; i < bp->irq_nvecs; i++) {
+               disable_irq(bp->irq_tbl[i].vector);
+               bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);
+               enable_irq(bp->irq_tbl[i].vector);
+       }
 }
 #endif