Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f1d86e4 authored by Stefan Assmann's avatar Stefan Assmann Committed by Jeff Kirsher
Browse files

i40e: handle setting administratively set MAC address back to zero 



When an administratively set MAC was previously set and should now be
switched back to 00:00:00:00:00:00 the pf_set_mac flag did not get
toggled back to false.
As a result VFs were still treated as if an administratively set MAC was
present.

Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 07c357f3

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+10 −2
Original line number Diff line number Diff line
@@ -2762,7 +2762,6 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 


	spin_unlock_bh(&vsi->mac_filter_hash_lock);



	dev_info(&pf->pdev->dev, "Setting MAC %pM on VF %d\n", mac, vf_id);

	/* program mac filter */

	if (i40e_sync_vsi_filters(vsi)) {

		dev_err(&pf->pdev->dev, "Unable to program ucast filters\n");
@@ -2770,7 +2769,16 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 
		goto error_param;

	}

	ether_addr_copy(vf->default_lan_addr.addr, mac);



	if (is_zero_ether_addr(mac)) {

		vf->pf_set_mac = false;

		dev_info(&pf->pdev->dev, "Removing MAC on VF %d\n", vf_id);

	} else {

		vf->pf_set_mac = true;

		dev_info(&pf->pdev->dev, "Setting MAC %pM on VF %d\n",

			 mac, vf_id);

	}



	/* Force the VF driver stop so it has to reload with new MAC address */

	i40e_vc_disable_vf(pf, vf);

	dev_info(&pf->pdev->dev, "Reload the VF driver to make this change effective.\n");