UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

vmxnet3: fix building without CONFIG_PCI_MSI 

Since commit d25f06ea46 "vmxnet3: fix netpoll race condition",
the vmxnet3 driver fails to build when CONFIG_PCI_MSI is disabled,
because it unconditionally references the vmxnet3_msix_rx()
function.

To fix this, use the same #ifdef in the caller that exists around
the function definition.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Shreyas Bhatewara <sbhatewara@vmware.com>
Cc: "VMware, Inc." <pv-drivers@vmware.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: stable@vger.kernel.org
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2014-03-13 10:44:34 +01:00 committed by David S. Miller
parent f4e53f9a4f
commit 0a8d8c446b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/vmxnet3/vmxnet3_drv.c
View File

@ -1761,13 +1761,16 @@ static void
vmxnet3_netpoll(struct net_device *netdev) vmxnet3_netpoll(struct net_device *netdev)
{ {
struct vmxnet3_adapter *adapter = netdev_priv(netdev); struct vmxnet3_adapter *adapter = netdev_priv(netdev);
int i;
switch (adapter->intr.type) { switch (adapter->intr.type) {
case VMXNET3_IT_MSIX: #ifdef CONFIG_PCI_MSI
case VMXNET3_IT_MSIX: {
int i;
for (i = 0; i < adapter->num_rx_queues; i++) for (i = 0; i < adapter->num_rx_queues; i++)
vmxnet3_msix_rx(0, &adapter->rx_queue[i]); vmxnet3_msix_rx(0, &adapter->rx_queue[i]);
break; break;
}
#endif
case VMXNET3_IT_MSI: case VMXNET3_IT_MSI:
default: default:
vmxnet3_intr(0, adapter->netdev); vmxnet3_intr(0, adapter->netdev);