diff options
author | Brett Creeley <brett.creeley@intel.com> | 2019-04-16 10:24:37 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 09:10:15 +0200 |
commit | 43306a82a89dba9ad044087e74d8fc0ac2873522 (patch) | |
tree | 4fc2b9468da66b10f5ba15e2c8a74e0ec692eb4d /drivers/net/ethernet/intel/ice/ice_main.c | |
parent | 55635ebe4f6aec64d7359ddf2901f8d138a8993d (diff) | |
download | linux-stable-43306a82a89dba9ad044087e74d8fc0ac2873522.tar.gz linux-stable-43306a82a89dba9ad044087e74d8fc0ac2873522.tar.bz2 linux-stable-43306a82a89dba9ad044087e74d8fc0ac2873522.zip |
ice: Fix couple of issues in ice_vsi_release
[ Upstream commit aa6ccf3f2d7042f94c4e91538956ce7051e7856e ]
Currently the driver is calling ice_napi_del() and then
unregister_netdev(). The call to unregister_netdev() will result in a
call to ice_stop() and then ice_vsi_close(). This is where we call
napi_disable() for all the MSI-X vectors. This flow is reversed so make
the changes to ensure napi_disable() happens prior to napi_del().
Before calling napi_del() and free_netdev() make sure
unregister_netdev() was called. This is done by making sure the
__ICE_DOWN bit is set in the vsi->state for the interested VSI.
Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 7843abf4d44d..dbf3d39ad8b1 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -1667,7 +1667,7 @@ skip_req_irq: * ice_napi_del - Remove NAPI handler for the VSI * @vsi: VSI for which NAPI handler is to be removed */ -void ice_napi_del(struct ice_vsi *vsi) +static void ice_napi_del(struct ice_vsi *vsi) { int v_idx; |