OSDN Git Service

ibmvnic: Validate napi exist before disabling them
authorNathan Fontenot <nfont@linux.vnet.ibm.com>
Fri, 21 Apr 2017 19:39:10 +0000 (15:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Apr 2017 16:52:13 +0000 (12:52 -0400)
Validate that the napi structs exist before trying to disable them
at driver close.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ibm/ibmvnic.c

index 115f216..5a916a2 100644 (file)
@@ -729,8 +729,10 @@ static int ibmvnic_close(struct net_device *netdev)
        adapter->closing = true;
        disable_sub_crqs(adapter);
 
-       for (i = 0; i < adapter->req_rx_queues; i++)
-               napi_disable(&adapter->napi[i]);
+       if (adapter->napi) {
+               for (i = 0; i < adapter->req_rx_queues; i++)
+                       napi_disable(&adapter->napi[i]);
+       }
 
        if (!adapter->failover)
                netif_tx_stop_all_queues(netdev);