diff options
| author | Nathan Fontenot <nfont@linux.vnet.ibm.com> | 2017-05-23 21:53:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-17 06:41:50 +0200 |
| commit | 4544ba3173b7e4f15c8c921997847390e5652268 (patch) | |
| tree | 5fa56439879397cdc2c21f9a6406bd7ef2b0ce6b /drivers/net/ethernet | |
| parent | 74e24d1ea1a4fc8e1d4faa43263229aa45513cd3 (diff) | |
ibmvnic: Call napi_disable instead of napi_enable in failure path
[ Upstream commit e722af6391949e8851310441bb0cec157d25611d ]
The failure path in ibmvnic_open() mistakenly makes a second call
to napi_enable instead of calling napi_disable. This can result
in a BUG_ON for any queues that were enabled in the previous call
to napi_enable.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index d1cf37dc3aa2..38314244f000 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -505,7 +505,7 @@ rx_pool_alloc_failed: adapter->rx_pool = NULL; rx_pool_arr_alloc_failed: for (i = 0; i < adapter->req_rx_queues; i++) - napi_enable(&adapter->napi[i]); + napi_disable(&adapter->napi[i]); alloc_napi_failed: return -ENOMEM; } |