From: Nathan Fontenot Date: Wed, 3 May 2017 18:04:44 +0000 (-0400) Subject: ibmvnic: Delete napi's when releasing driver resources X-Git-Tag: v4.12-rc1~98^2~10^2~7 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7bac00b4056ab951c377aff99bb91b81890c727;p=karo-tx-linux.git ibmvnic: Delete napi's when releasing driver resources The napi structs allocated at drivier initializatio need to be free'ed when releasing the drivers resources. Signed-off-by: Nathan Fontenot Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index a7c7a94c9d63..d52d98cf9317 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -552,11 +552,20 @@ static int ibmvnic_login(struct net_device *netdev) static void release_resources(struct ibmvnic_adapter *adapter) { + int i; + release_tx_pools(adapter); release_rx_pools(adapter); release_stats_token(adapter); release_error_buffers(adapter); + + if (adapter->napi) { + for (i = 0; i < adapter->req_rx_queues; i++) { + if (&adapter->napi[i]) + netif_napi_del(&adapter->napi[i]); + } + } } static int set_link_state(struct ibmvnic_adapter *adapter, u8 link_state)