diff options
| author | Brett Creeley <[email protected]> | 2019-02-08 20:50:36 +0000 |
|---|---|---|
| committer | Jeff Kirsher <[email protected]> | 2019-02-25 16:56:01 +0000 |
| commit | b751930c6c21c3a6abc447f4f76fa2c28a11cb91 (patch) | |
| tree | 072cc4c8c45b8b3570cb0c685662bfd13a5ce45c /drivers/net/ethernet/intel/ice/ice_lib.c | |
| parent | ice: fix numeric overflow warning (diff) | |
| download | kernel-b751930c6c21c3a6abc447f4f76fa2c28a11cb91.tar.gz kernel-b751930c6c21c3a6abc447f4f76fa2c28a11cb91.zip | |
ice: only use the VF for ICE_VSI_VF in ice_vsi_release
In ice_vsi_release we are always assigning a value to the local VF
variable. Change this to only be assigned if the VSI is a VF VSI.
Signed-off-by: Brett Creeley <[email protected]>
Signed-off-by: Anirudh Venkataramanan <[email protected]>
Tested-by: Andrew Bowers <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_lib.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index d93a0d5a783c..fa61203bee26 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -2518,13 +2518,15 @@ void ice_vsi_dis_irq(struct ice_vsi *vsi) */ int ice_vsi_release(struct ice_vsi *vsi) { + struct ice_vf *vf = NULL; struct ice_pf *pf; - struct ice_vf *vf; if (!vsi->back) return -ENODEV; pf = vsi->back; - vf = &pf->vf[vsi->vf_id]; + + if (vsi->type == ICE_VSI_VF) + vf = &pf->vf[vsi->vf_id]; /* do not unregister and free netdevs while driver is in the reset * recovery pending state. Since reset/rebuild happens through PF * service task workqueue, its not a good idea to unregister netdev |