Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a8d8c44 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

vmxnet3: fix building without CONFIG_PCI_MSI 



Since commit d25f06ea "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: default avatarArnd 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: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4e53f9a

drivers/net/vmxnet3/vmxnet3_drv.c

+5 −2
Original line number Diff line number Diff line
@@ -1761,13 +1761,16 @@ static void 
vmxnet3_netpoll(struct net_device *netdev)

{

	struct vmxnet3_adapter *adapter = netdev_priv(netdev);

	int i;



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

			vmxnet3_msix_rx(0, &adapter->rx_queue[i]);

		break;

	}

#endif

	case VMXNET3_IT_MSI:

	default:

		vmxnet3_intr(0, adapter->netdev);