i40e: Delete stale MAC filters after change

Delete all the old and stale MAC filters for the VF VSI when the host
administrator changes the VF MAC address from under its feet.  Also don't
bother to add a filter for the VSI when its going to go away anyway.
Just record the new address and punch the VF reset.

Change-ID: Ic0d12055926f41989d1965ccf500053729c063ad
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 3f6cad46365c636fc54eb4b8357e4f53daf87013..385a46f910d6b8e4a37696283a46f9b4c5130e48 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2063,14 +2063,11 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
        i40e_del_filter(vsi, vf->default_lan_addr.addr, vf->port_vlan_id,
                        true, false);
 
-       /* add the new mac address */
-       f = i40e_add_filter(vsi, mac, vf->port_vlan_id, true, false);
-       if (!f) {
-               dev_err(&pf->pdev->dev,
-                       "Unable to add VF ucast filter\n");
-               ret = -ENOMEM;
-               goto error_param;
-       }
+       /* Delete all the filters for this VSI - we're going to kill it
+        * anyway.
+        */
+       list_for_each_entry(f, &vsi->mac_filter_list, list)
+               i40e_del_filter(vsi, f->macaddr, f->vlan, true, false);
 
        dev_info(&pf->pdev->dev, "Setting MAC %pM on VF %d\n", mac, vf_id);
        /* program mac filter */