Patchwork netxen: fix poll implementation

login
register
mail settings
Submitter Yinglin Luan
Date Aug. 23, 2010, 7:56 a.m.
Message ID <4C7229A3.7070306@gmail.com>
Download mbox | patch
Permalink /patch/62451/
State Accepted
Delegated to: David Miller
Headers show

Comments

Yinglin Luan - Aug. 23, 2010, 7:56 a.m.
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>
---
 drivers/net/netxen/netxen_nic_main.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
David Miller - Aug. 24, 2010, 3:29 a.m.
From: Yinglin Luan <synmyth@gmail.com>
Date: Mon, 23 Aug 2010 15:56:19 +0800

> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index fd86e18..4147be5 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -2133,9 +2133,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