]> Pileus Git - ~andy/linux/commitdiff
netxen: fix poll implementation
authorYinglin Luan <synmyth@gmail.com>
Sun, 22 Aug 2010 21:56:19 +0000 (21:56 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Aug 2010 03:28:55 +0000 (20:28 -0700)
Function netxen_intr has pointer to nx_host_sds_ring
as second parameter not pointer to netxen_adapter.

Signed-off-by: Yinglin Luan <synmyth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/netxen/netxen_nic_main.c

index cb30df106a2c3d7981d74c085a49194e790c86b9..73d31459223098c8e3727a0565ed12805d58e388 100644 (file)
@@ -2131,9 +2131,16 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void netxen_nic_poll_controller(struct net_device *netdev)
 {
+       int ring;
+       struct nx_host_sds_ring *sds_ring;
        struct netxen_adapter *adapter = netdev_priv(netdev);
+       struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
+
        disable_irq(adapter->irq);
-       netxen_intr(adapter->irq, adapter);
+       for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+               sds_ring = &recv_ctx->sds_rings[ring];
+               netxen_intr(adapter->irq, sds_ring);
+       }
        enable_irq(adapter->irq);
 }
 #endif