diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-18 10:12:31 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 10:12:31 +0100 |
| commit | bcc298bc924e0a990f853ba3e19f8b5a833cba7e (patch) | |
| tree | 1c87c8f73dc41fd11ee3dacb1b91a7cc8b4798bb /drivers/net/vmxnet3/vmxnet3_drv.c | |
| parent | Merge branch 'drm-docs' of ssh://people.freedesktop.org/~danvet/drm into drm-... (diff) | |
| parent | Linux 3.14-rc7 (diff) | |
| download | linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.tar.xz linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.zip | |
Merge tag 'v3.14-rc7' into drm-next
Linux 3.14-rc7
Backmerge to help out Intel guys.
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_drv.c')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 3be786faaaec..0fa3b44f7342 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -1762,11 +1762,20 @@ vmxnet3_netpoll(struct net_device *netdev) { struct vmxnet3_adapter *adapter = netdev_priv(netdev); - if (adapter->intr.mask_mode == VMXNET3_IMM_ACTIVE) - vmxnet3_disable_all_intrs(adapter); - - vmxnet3_do_poll(adapter, adapter->rx_queue[0].rx_ring[0].size); - vmxnet3_enable_all_intrs(adapter); + switch (adapter->intr.type) { +#ifdef CONFIG_PCI_MSI + case VMXNET3_IT_MSIX: { + int i; + for (i = 0; i < adapter->num_rx_queues; i++) + vmxnet3_msix_rx(0, &adapter->rx_queue[i]); + break; + } +#endif + case VMXNET3_IT_MSI: + default: + vmxnet3_intr(0, adapter->netdev); + break; + } } #endif /* CONFIG_NET_POLL_CONTROLLER */ |