aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vmxnet3
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-13 05:44:34 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-13 12:56:38 -0400
commit0a8d8c446b5429d15ff2d48f46e00d8a08552303 (patch)
tree0da245c4d00e5551d72cbd1c6566f1438adde9e5 /drivers/net/vmxnet3
parentf4e53f9a4f7d01cef9f096b1eb3705329a7ce9c2 (diff)
vmxnet3: fix building without CONFIG_PCI_MSI
Since commit d25f06ea466e "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>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index b7daa02ff026..0fa3b44f7342 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1761,13 +1761,16 @@ static void
1761vmxnet3_netpoll(struct net_device *netdev) 1761vmxnet3_netpoll(struct net_device *netdev)
1762{ 1762{
1763 struct vmxnet3_adapter *adapter = netdev_priv(netdev); 1763 struct vmxnet3_adapter *adapter = netdev_priv(netdev);
1764 int i;
1765 1764
1766 switch (adapter->intr.type) { 1765 switch (adapter->intr.type) {
1767 case VMXNET3_IT_MSIX: 1766#ifdef CONFIG_PCI_MSI
1767 case VMXNET3_IT_MSIX: {
1768 int i;
1768 for (i = 0; i < adapter->num_rx_queues; i++) 1769 for (i = 0; i < adapter->num_rx_queues; i++)
1769 vmxnet3_msix_rx(0, &adapter->rx_queue[i]); 1770 vmxnet3_msix_rx(0, &adapter->rx_queue[i]);
1770 break; 1771 break;
1772 }
1773#endif
1771 case VMXNET3_IT_MSI: 1774 case VMXNET3_IT_MSI:
1772 default: 1775 default:
1773 vmxnet3_intr(0, adapter->netdev); 1776 vmxnet3_intr(0, adapter->netdev);