hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
....@@ -4332,9 +4332,6 @@
43324332 /* duplicate request, so just return success */
43334333 goto error_pvid;
43344334
4335
- i40e_vc_reset_vf(vf, true);
4336
- /* During reset the VF got a new VSI, so refresh a pointer. */
4337
- vsi = pf->vsi[vf->lan_vsi_idx];
43384335 /* Locked once because multiple functions below iterate list */
43394336 spin_lock_bh(&vsi->mac_filter_hash_lock);
43404337
....@@ -4420,6 +4417,10 @@
44204417 */
44214418 vf->port_vlan_id = le16_to_cpu(vsi->info.pvid);
44224419
4420
+ i40e_vc_reset_vf(vf, true);
4421
+ /* During reset the VF got a new VSI, so refresh a pointer. */
4422
+ vsi = pf->vsi[vf->lan_vsi_idx];
4423
+
44234424 ret = i40e_config_vf_promiscuous_mode(vf, vsi->id, allmulti, alluni);
44244425 if (ret) {
44254426 dev_err(&pf->pdev->dev, "Unable to config vf promiscuous mode\n");