i40e: Communicate VSI id in place of VSI index to the VFs

This does not affect the Virtual channel API as such but it changes the
meaning of what is communicated to the VSI resource struct as vsi_id.
Earlier vsi_idx was being passed in, which was the index in the PF's VSI
array. Now we pass vsi_id as communicated by the FW to the driver.
This will help with future expansion of VF and FW communication.

With this in place now the VF and Virtual channel driver change to move over
to VSI id use is complete and is validated.

Change-ID: I14246ef82b3b3dc1fa76291d2dd0c05d12cedb7c
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

4 files changed, 76 insertions, 53 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 1c8bd7c152c2..33c35d3b7420 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -628,6 +628,7 @@ extern const char i40e_driver_name[];
 extern const char i40e_driver_version_str[];
 void i40e_do_reset_safe(struct i40e_pf *pf, u32 reset_flags);
 void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags);
+struct i40e_vsi *i40e_find_vsi_from_id(struct i40e_pf *pf, u16 id);
 void i40e_update_stats(struct i40e_vsi *vsi);
 void i40e_update_eth_stats(struct i40e_vsi *vsi);
 struct rtnl_link_stats64 *i40e_get_vsi_stats_struct(struct i40e_vsi *vsi);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 5e79054f2801..89a2d76a1f69 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -250,6 +250,22 @@ static int i40e_put_lump(struct i40e_lump_tracking *pile, u16 index, u16 id)
 }
 
 /**
+ * i40e_find_vsi_from_id - searches for the vsi with the given id
+ * @pf - the pf structure to search for the vsi
+ * @id - id of the vsi it is searching for
+ **/
+struct i40e_vsi *i40e_find_vsi_from_id(struct i40e_pf *pf, u16 id)
+{
+        int i;
+
+        for (i = 0; i < pf->num_alloc_vsi; i++)
+                if (pf->vsi[i] && (pf->vsi[i]->id == id))
+                        return pf->vsi[i];
+
+        return NULL;
+}
+
+/**
  * i40e_service_event_schedule - Schedule the service task to wake up
  * @pf: board private structure
  *
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 184b00390f57..4d69e1f04901 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -53,13 +53,12 @@ static inline void i40e_vc_disable_vf(struct i40e_pf *pf, struct i40e_vf *vf)
  *
  * check for the valid VSI id
  **/
-static inline bool i40e_vc_isvalid_vsi_id(struct i40e_vf *vf, u8 vsi_id)
+static inline bool i40e_vc_isvalid_vsi_id(struct i40e_vf *vf, u16 vsi_id)
 {
         struct i40e_pf *pf = vf->pf;
+        struct i40e_vsi *vsi = i40e_find_vsi_from_id(pf, vsi_id);
 
-        if (vsi_id > pf->num_alloc_vsi)
-                return false;
-        return pf->vsi[vsi_id]->vf_id == vf->vf_id;
+        return (vsi && (vsi->vf_id == vf->vf_id));
 }
 
 /**
@@ -70,12 +69,13 @@ static inline bool i40e_vc_isvalid_vsi_id(struct i40e_vf *vf, u8 vsi_id)
  *
  * check for the valid queue id
  **/
-static inline bool i40e_vc_isvalid_queue_id(struct i40e_vf *vf, u8 vsi_id,
+static inline bool i40e_vc_isvalid_queue_id(struct i40e_vf *vf, u16 vsi_id,
                                             u8 qid)
 {
         struct i40e_pf *pf = vf->pf;
+        struct i40e_vsi *vsi = i40e_find_vsi_from_id(pf, vsi_id);
 
-        return qid < pf->vsi[vsi_id]->alloc_queue_pairs;
+        return (vsi && (qid < vsi->alloc_queue_pairs));
 }
 
 /**
@@ -97,18 +97,21 @@ static inline bool i40e_vc_isvalid_vector_id(struct i40e_vf *vf, u8 vector_id)
 /**
  * i40e_vc_get_pf_queue_id
  * @vf: pointer to the VF info
- * @vsi_idx: index of VSI in PF struct
+ * @vsi_id: id of VSI as provided by the FW
  * @vsi_queue_id: vsi relative queue id
  *
  * return PF relative queue id
  **/
-static u16 i40e_vc_get_pf_queue_id(struct i40e_vf *vf, u8 vsi_idx,
+static u16 i40e_vc_get_pf_queue_id(struct i40e_vf *vf, u16 vsi_id,
                                    u8 vsi_queue_id)
 {
         struct i40e_pf *pf = vf->pf;
-        struct i40e_vsi *vsi = pf->vsi[vsi_idx];
+        struct i40e_vsi *vsi = i40e_find_vsi_from_id(pf, vsi_id);
         u16 pf_queue_id = I40E_QUEUE_END_OF_LIST;
 
+        if (!vsi)
+                return pf_queue_id;
+
         if (le16_to_cpu(vsi->info.mapping_flags) &
             I40E_AQ_VSI_QUE_MAP_NONCONTIG)
                 pf_queue_id =
@@ -123,12 +126,12 @@ static u16 i40e_vc_get_pf_queue_id(struct i40e_vf *vf, u8 vsi_idx,
 /**
  * i40e_config_irq_link_list
  * @vf: pointer to the VF info
- * @vsi_idx: index of VSI in PF struct
+ * @vsi_id: id of VSI as given by the FW
  * @vecmap: irq map info
  *
  * configure irq link list from the map
  **/
-static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_idx,
+static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_id,
                                       struct i40e_virtchnl_vector_map *vecmap)
 {
         unsigned long linklistmap = 0, tempmap;
@@ -173,7 +176,7 @@ static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_idx,
                                  I40E_VIRTCHNL_SUPPORTED_QTYPES));
         vsi_queue_id = next_q/I40E_VIRTCHNL_SUPPORTED_QTYPES;
         qtype = next_q%I40E_VIRTCHNL_SUPPORTED_QTYPES;
-        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_idx, vsi_queue_id);
+        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_id, vsi_queue_id);
         reg = ((qtype << I40E_VPINT_LNKLSTN_FIRSTQ_TYPE_SHIFT) | pf_queue_id);
 
         wr32(hw, reg_idx, reg);
@@ -200,7 +203,7 @@ static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_idx,
                     (I40E_MAX_VSI_QP * I40E_VIRTCHNL_SUPPORTED_QTYPES)) {
                         vsi_queue_id = next_q / I40E_VIRTCHNL_SUPPORTED_QTYPES;
                         qtype = next_q % I40E_VIRTCHNL_SUPPORTED_QTYPES;
-                        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_idx,
+                        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_id,
                                                               vsi_queue_id);
                 } else {
                         pf_queue_id = I40E_QUEUE_END_OF_LIST;
@@ -223,24 +226,26 @@ irq_list_done:
 /**
  * i40e_config_vsi_tx_queue
  * @vf: pointer to the VF info
- * @vsi_idx: index of VSI in PF struct
+ * @vsi_id: id of VSI as provided by the FW
  * @vsi_queue_id: vsi relative queue index
  * @info: config. info
  *
  * configure tx queue
  **/
-static int i40e_config_vsi_tx_queue(struct i40e_vf *vf, u16 vsi_idx,
+static int i40e_config_vsi_tx_queue(struct i40e_vf *vf, u16 vsi_id,
                                     u16 vsi_queue_id,
                                     struct i40e_virtchnl_txq_info *info)
 {
         struct i40e_pf *pf = vf->pf;
         struct i40e_hw *hw = &pf->hw;
         struct i40e_hmc_obj_txq tx_ctx;
+        struct i40e_vsi *vsi;
         u16 pf_queue_id;
         u32 qtx_ctl;
         int ret = 0;
 
-        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_idx, vsi_queue_id);
+        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_id, vsi_queue_id);
+        vsi = i40e_find_vsi_from_id(pf, vsi_id);
 
         /* clear the context structure first */
         memset(&tx_ctx, 0, sizeof(struct i40e_hmc_obj_txq));
@@ -248,7 +253,7 @@ static int i40e_config_vsi_tx_queue(struct i40e_vf *vf, u16 vsi_idx,
         /* only set the required fields */
         tx_ctx.base = info->dma_ring_addr / 128;
         tx_ctx.qlen = info->ring_len;
-        tx_ctx.rdylist = le16_to_cpu(pf->vsi[vsi_idx]->info.qs_handle[0]);
+        tx_ctx.rdylist = le16_to_cpu(vsi->info.qs_handle[0]);
         tx_ctx.rdylist_act = 0;
         tx_ctx.head_wb_ena = info->headwb_enabled;
         tx_ctx.head_wb_addr = info->dma_headwb_addr;
@@ -290,13 +295,13 @@ error_context:
 /**
  * i40e_config_vsi_rx_queue
  * @vf: pointer to the VF info
- * @vsi_idx: index of VSI in PF struct
+ * @vsi_id: id of VSI  as provided by the FW
  * @vsi_queue_id: vsi relative queue index
  * @info: config. info
  *
  * configure rx queue
  **/
-static int i40e_config_vsi_rx_queue(struct i40e_vf *vf, u16 vsi_idx,
+static int i40e_config_vsi_rx_queue(struct i40e_vf *vf, u16 vsi_id,
                                     u16 vsi_queue_id,
                                     struct i40e_virtchnl_rxq_info *info)
 {
@@ -306,7 +311,7 @@ static int i40e_config_vsi_rx_queue(struct i40e_vf *vf, u16 vsi_idx,
         u16 pf_queue_id;
         int ret = 0;
 
-        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_idx, vsi_queue_id);
+        pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_id, vsi_queue_id);
 
         /* clear the context structure first */
         memset(&rx_ctx, 0, sizeof(struct i40e_hmc_obj_rxq));
@@ -403,7 +408,7 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)
         }
         if (type == I40E_VSI_SRIOV) {
                 u8 brdcast[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-                vf->lan_vsi_index = vsi->idx;
+                vf->lan_vsi_idx = vsi->idx;
                 vf->lan_vsi_id = vsi->id;
                 /* If the port VLAN has been configured and then the
                  * VF driver was removed then the VSI port VLAN
@@ -468,8 +473,8 @@ static void i40e_enable_vf_mappings(struct i40e_vf *vf)
         wr32(hw, I40E_VPLAN_MAPENA(vf->vf_id), reg);
 
         /* map PF queues to VF queues */
-        for (j = 0; j < pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs; j++) {
-                u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_index, j);
+        for (j = 0; j < pf->vsi[vf->lan_vsi_idx]->alloc_queue_pairs; j++) {
+                u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_id, j);
                 reg = (qid & I40E_VPLAN_QTABLE_QINDEX_MASK);
                 wr32(hw, I40E_VPLAN_QTABLE(total_queue_pairs, vf->vf_id), reg);
                 total_queue_pairs++;
@@ -477,13 +482,13 @@ static void i40e_enable_vf_mappings(struct i40e_vf *vf)
 
         /* map PF queues to VSI */
         for (j = 0; j < 7; j++) {
-                if (j * 2 >= pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs) {
+                if (j * 2 >= pf->vsi[vf->lan_vsi_idx]->alloc_queue_pairs) {
                         reg = 0x07FF07FF;       /* unused */
                 } else {
-                        u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_index,
+                        u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_id,
                                                           j * 2);
                         reg = qid;
-                        qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_index,
+                        qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_id,
                                                       (j * 2) + 1);
                         reg |= qid << 16;
                 }
@@ -527,9 +532,9 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
         int i, msix_vf;
 
         /* free vsi & disconnect it from the parent uplink */
-        if (vf->lan_vsi_index) {
-                i40e_vsi_release(pf->vsi[vf->lan_vsi_index]);
-                vf->lan_vsi_index = 0;
+        if (vf->lan_vsi_idx) {
+                i40e_vsi_release(pf->vsi[vf->lan_vsi_idx]);
+                vf->lan_vsi_idx = 0;
                 vf->lan_vsi_id = 0;
         }
         msix_vf = pf->hw.func_caps.num_msix_vectors_vf;
@@ -584,7 +589,7 @@ static int i40e_alloc_vf_res(struct i40e_vf *vf)
         ret = i40e_alloc_vsi_res(vf, I40E_VSI_SRIOV);
         if (ret)
                 goto error_alloc;
-        total_queue_pairs += pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs;
+        total_queue_pairs += pf->vsi[vf->lan_vsi_idx]->alloc_queue_pairs;
         set_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);
 
         /* store the total qps number for the runtime
@@ -694,10 +699,10 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
         wr32(hw, I40E_VPGEN_VFRTRIG(vf->vf_id), reg);
 
         /* On initial reset, we won't have any queues */
-        if (vf->lan_vsi_index == 0)
+        if (vf->lan_vsi_idx == 0)
                 goto complete_reset;
 
-        i40e_vsi_control_rings(pf->vsi[vf->lan_vsi_index], false);
+        i40e_vsi_control_rings(pf->vsi[vf->lan_vsi_idx], false);
 complete_reset:
         /* reallocate VF resources to reset the VSI state */
         i40e_free_vf_res(vf);
@@ -1018,18 +1023,18 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf)
         }
 
         vfres->vf_offload_flags = I40E_VIRTCHNL_VF_OFFLOAD_L2;
-        vsi = pf->vsi[vf->lan_vsi_index];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (!vsi->info.pvid)
                 vfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_VLAN;
 
         vfres->num_vsis = num_vsis;
         vfres->num_queue_pairs = vf->num_queue_pairs;
         vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf;
-        if (vf->lan_vsi_index) {
-                vfres->vsi_res[i].vsi_id = vf->lan_vsi_index;
+        if (vf->lan_vsi_idx) {
+                vfres->vsi_res[i].vsi_id = vf->lan_vsi_id;
                 vfres->vsi_res[i].vsi_type = I40E_VSI_SRIOV;
                 vfres->vsi_res[i].num_queue_pairs =
-                    pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs;
+                    pf->vsi[vf->lan_vsi_idx]->alloc_queue_pairs;
                 memcpy(vfres->vsi_res[i].default_mac_addr,
                        vf->default_lan_addr.addr, ETH_ALEN);
                 i++;
@@ -1081,14 +1086,14 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,
         bool allmulti = false;
         i40e_status aq_ret;
 
+        vsi = i40e_find_vsi_from_id(pf, info->vsi_id);
         if (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||
             !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps) ||
             !i40e_vc_isvalid_vsi_id(vf, info->vsi_id) ||
-            (pf->vsi[info->vsi_id]->type != I40E_VSI_FCOE)) {
+            (vsi->type != I40E_VSI_FCOE)) {
                 aq_ret = I40E_ERR_PARAM;
                 goto error_param;
         }
-        vsi = pf->vsi[info->vsi_id];
         if (info->flags & I40E_FLAG_VF_MULTICAST_PROMISC)
                 allmulti = true;
         aq_ret = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid,
@@ -1150,7 +1155,7 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                 }
         }
         /* set vsi num_queue_pairs in use to num configured by VF */
-        pf->vsi[vf->lan_vsi_index]->num_queue_pairs = qci->num_queue_pairs;
+        pf->vsi[vf->lan_vsi_idx]->num_queue_pairs = qci->num_queue_pairs;
 
 error_param:
         /* send the response to the VF */
@@ -1251,7 +1256,8 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                 aq_ret = I40E_ERR_PARAM;
                 goto error_param;
         }
-        if (i40e_vsi_control_rings(pf->vsi[vsi_id], true))
+
+        if (i40e_vsi_control_rings(pf->vsi[vf->lan_vsi_idx], true))
                 aq_ret = I40E_ERR_TIMEOUT;
 error_param:
         /* send the response to the VF */
@@ -1273,7 +1279,6 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
         struct i40e_virtchnl_queue_select *vqs =
             (struct i40e_virtchnl_queue_select *)msg;
         struct i40e_pf *pf = vf->pf;
-        u16 vsi_id = vqs->vsi_id;
         i40e_status aq_ret = 0;
 
         if (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {
@@ -1290,7 +1295,8 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                 aq_ret = I40E_ERR_PARAM;
                 goto error_param;
         }
-        if (i40e_vsi_control_rings(pf->vsi[vsi_id], false))
+
+        if (i40e_vsi_control_rings(pf->vsi[vf->lan_vsi_idx], false))
                 aq_ret = I40E_ERR_TIMEOUT;
 
 error_param:
@@ -1328,7 +1334,7 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                 goto error_param;
         }
 
-        vsi = pf->vsi[vqs->vsi_id];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (!vsi) {
                 aq_ret = I40E_ERR_PARAM;
                 goto error_param;
@@ -1406,7 +1412,7 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                 if (ret)
                         goto error_param;
         }
-        vsi = pf->vsi[vsi_id];
+        vsi = pf->vsi[vf->lan_vsi_idx];
 
         /* add new addresses to the list */
         for (i = 0; i < al->num_elements; i++) {
@@ -1474,7 +1480,7 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                         goto error_param;
                 }
         }
-        vsi = pf->vsi[vsi_id];
+        vsi = pf->vsi[vf->lan_vsi_idx];
 
         /* delete addresses from the list */
         for (i = 0; i < al->num_elements; i++)
@@ -1524,7 +1530,7 @@ static int i40e_vc_add_vlan_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                         goto error_param;
                 }
         }
-        vsi = pf->vsi[vsi_id];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (vsi->info.pvid) {
                 aq_ret = I40E_ERR_PARAM;
                 goto error_param;
@@ -1577,7 +1583,7 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                 }
         }
 
-        vsi = pf->vsi[vsi_id];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (vsi->info.pvid) {
                 aq_ret = I40E_ERR_PARAM;
                 goto error_param;
@@ -1966,7 +1972,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
         }
 
         vf = &(pf->vf[vf_id]);
-        vsi = pf->vsi[vf->lan_vsi_index];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
                 dev_err(&pf->pdev->dev,
                         "Uninitialized VF %d\n", vf_id);
@@ -2040,7 +2046,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
         }
 
         vf = &(pf->vf[vf_id]);
-        vsi = pf->vsi[vf->lan_vsi_index];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
                 dev_err(&pf->pdev->dev, "Uninitialized VF %d\n", vf_id);
                 ret = -EINVAL;
@@ -2153,7 +2159,7 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
         }
 
         vf = &(pf->vf[vf_id]);
-        vsi = pf->vsi[vf->lan_vsi_index];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
                 dev_err(&pf->pdev->dev, "Uninitialized VF %d.\n", vf_id);
                 ret = -EINVAL;
@@ -2227,7 +2233,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
 
         vf = &(pf->vf[vf_id]);
         /* first vsi is always the LAN vsi */
-        vsi = pf->vsi[vf->lan_vsi_index];
+        vsi = pf->vsi[vf->lan_vsi_idx];
         if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
                 dev_err(&pf->pdev->dev, "Uninitialized VF %d\n", vf_id);
                 ret = -EINVAL;
@@ -2351,7 +2357,7 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable)
 
         vf->spoofchk = enable;
         memset(&ctxt, 0, sizeof(ctxt));
-        ctxt.seid = pf->vsi[vf->lan_vsi_index]->seid;
+        ctxt.seid = pf->vsi[vf->lan_vsi_idx]->seid;
         ctxt.pf_num = pf->hw.pf_id;
         ctxt.info.valid_sections = cpu_to_le16(I40E_AQ_VSI_PROP_SECURITY_VALID);
         if (enable)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index 9c3a41040835..09043c1aae54 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -88,7 +88,7 @@ struct i40e_vf {
          * When assigned, these will be non-zero, because VSI 0 is always
          * the main LAN VSI for the PF.
          */
-        u8 lan_vsi_index;       /* index into PF struct */
+        u8 lan_vsi_idx;         /* index into PF struct */
         u8 lan_vsi_id;          /* ID as used by firmware */
 
         u8 num_queue_pairs;     /* num of qps assigned to VF vsis */