ixgbe: force VF to grab new MAC on driver reload

Do not validate the MAC address during a reset, unless the MAC was set on
the host. This way the VF will get a new MAC address every time it reloads.

Remove the "no MAC address assigned" message since it will get spammed on
reset and it doesn't help much as the MAC on the VF is randomly generated.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 2649c06d877b28f58bfb537368b89f15c0a484de..6f59933cdff7d5ff13620ced894036ddeb3052c3 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -854,14 +854,11 @@ static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
 
        /* reply to reset with ack and vf mac address */
        msgbuf[0] = IXGBE_VF_RESET;
-       if (!is_zero_ether_addr(vf_mac)) {
+       if (!is_zero_ether_addr(vf_mac) && adapter->vfinfo[vf].pf_set_mac) {
                msgbuf[0] |= IXGBE_VT_MSGTYPE_ACK;
                memcpy(addr, vf_mac, ETH_ALEN);
        } else {
                msgbuf[0] |= IXGBE_VT_MSGTYPE_NACK;
-               dev_warn(&adapter->pdev->dev,
-                        "VF %d has no MAC address assigned, you may have to assign one manually\n",
-                        vf);
        }
 
        /*