i40e: Prevent deleting MAC address from VF when set by PF

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / ethernet / intel / i40e / i40e_virtchnl_pf.c

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index e116d9a..cdb2638 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1677,6 +1677,16 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
                        ret = I40E_ERR_INVALID_MAC_ADDR;
                        goto error_param;
                }
+
+               if (vf->pf_set_mac &&
+                   ether_addr_equal(al->list[i].addr,
+                                    vf->default_lan_addr.addr)) {
+                       dev_err(&pf->pdev->dev,
+                               "MAC addr %pM has been set by PF, cannot delete it for VF %d, reset VF to change MAC addr\n",
+                               vf->default_lan_addr.addr, vf->vf_id);
+                       ret = I40E_ERR_PARAM;
+                       goto error_param;
+               }
        }
        vsi = pf->vsi[vf->lan_vsi_idx];