summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Underwood <johnx.underwood@intel.com>2016-02-18 09:19:24 -0800
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-02-18 23:52:45 -0800
commitf534039dd8ab39cb3259e5860d2be3b0e70aacbf (patch)
treebcfa790eac52cd0f57cc2f0ff2b62b2b84e61506
parentfe726082728da9f653d4e747baf0816d826fc626 (diff)
downloadop-kernel-dev-f534039dd8ab39cb3259e5860d2be3b0e70aacbf.zip
op-kernel-dev-f534039dd8ab39cb3259e5860d2be3b0e70aacbf.tar.gz
i40e: add check for null VSI
Return from i40e_vsi_reinit_setup() if vsi param is NULL. This makes this code consistent with all the other code that checks for NULL before using one of the VSI pointers accessed with an indexed variable. (Indexed VSI pointers are intentionally set to NULL in i40e_vsi_clear() and i40e_remove(). Change-ID: I3bc8b909c70fd2439334eeae994d151f61480985 Signed-off-by: John Underwood <johnx.underwood@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 05def9f..3ff3e83 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -9583,10 +9583,15 @@ vector_setup_out:
**/
static struct i40e_vsi *i40e_vsi_reinit_setup(struct i40e_vsi *vsi)
{
- struct i40e_pf *pf = vsi->back;
+ struct i40e_pf *pf;
u8 enabled_tc;
int ret;
+ if (!vsi)
+ return NULL;
+
+ pf = vsi->back;
+
i40e_put_lump(pf->qp_pile, vsi->base_queue, vsi->idx);
i40e_vsi_clear_rings(vsi);
OpenPOWER on IntegriCloud