lkml.org 
[lkml]   [2014]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 61/85] vmxnet3: fix building without CONFIG_PCI_MSI
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 0a8d8c446b5429d15ff2d48f46e00d8a08552303 upstream.

    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>
    Acked-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/vmxnet3/vmxnet3_drv.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/net/vmxnet3/vmxnet3_drv.c
    +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
    @@ -1740,13 +1740,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);



    \
     
     \ /
      Last update: 2014-03-21 04:41    [W:4.053 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site