aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-10 01:27:33 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-10 01:27:33 -0400
commite548833df83c3554229eff0672900bfe958b45fd (patch)
tree85efc4a76dc356593d6d394776aeb845dc580fb6 /drivers/net/qlcnic
parentcbd9da7be869f676afc204e1a664163778c770bd (diff)
parent053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/main.c
Diffstat (limited to 'drivers/net/qlcnic')
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 5a6445a691b3..5fd2abd1eb67 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -2513,9 +2513,16 @@ static int qlcnic_rx_poll(struct napi_struct *napi, int budget)
2513#ifdef CONFIG_NET_POLL_CONTROLLER 2513#ifdef CONFIG_NET_POLL_CONTROLLER
2514static void qlcnic_poll_controller(struct net_device *netdev) 2514static void qlcnic_poll_controller(struct net_device *netdev)
2515{ 2515{
2516 int ring;
2517 struct qlcnic_host_sds_ring *sds_ring;
2516 struct qlcnic_adapter *adapter = netdev_priv(netdev); 2518 struct qlcnic_adapter *adapter = netdev_priv(netdev);
2519 struct qlcnic_recv_context *recv_ctx = &adapter->recv_ctx;
2520
2517 disable_irq(adapter->irq); 2521 disable_irq(adapter->irq);
2518 qlcnic_intr(adapter->irq, adapter); 2522 for (ring = 0; ring < adapter->max_sds_rings; ring++) {
2523 sds_ring = &recv_ctx->sds_rings[ring];
2524 qlcnic_intr(adapter->irq, sds_ring);
2525 }
2519 enable_irq(adapter->irq); 2526 enable_irq(adapter->irq);
2520} 2527}
2521#endif 2528#endif