From: Patryk Małek <patryk.ma...@intel.com>

To prevent VF from deleting MAC address that was assigned by the
PF we need to check for that scenario when we try to delete a MAC
address from a VF.

Signed-off-by: Patryk Małek <patryk.ma...@intel.com>
Tested-by: Andrew Bowers <andrewx.bow...@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirs...@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c 
b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index f56c645588f3..3e707c7e6782 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2569,6 +2569,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];
 
-- 
2.17.1

Reply via email to