Commit 757976ab authored by Lihong Yang's avatar Lihong Yang Committed by Jeff Kirsher

ice: Fix check for removing/adding mac filters

In function ice_set_mac_address, we will remove old dev_addr before
adding the new MAC. In the removing and adding process of the MAC,
there is no need to return error if the check finds the to-be-removed
dev_addr does not exist in the MAC filter list or the to-be-added mac
already exists, keep going or return success accordingly.
Signed-off-by: default avatarLihong Yang <lihong.yang@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1b8f15b6
...@@ -3707,19 +3707,24 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi) ...@@ -3707,19 +3707,24 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
return -EBUSY; return -EBUSY;
} }
/* Clean up old MAC filter before changing the MAC address */ /* Clean up old MAC filter. Not an error if old filter doesn't exist */
status = ice_fltr_remove_mac(vsi, netdev->dev_addr, ICE_FWD_TO_VSI); status = ice_fltr_remove_mac(vsi, netdev->dev_addr, ICE_FWD_TO_VSI);
if (status) { if (status && status != ICE_ERR_DOES_NOT_EXIST) {
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
goto err_update_filters; goto err_update_filters;
} }
/* Add filter for new MAC. If filter exists, just return success */
status = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI); status = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
if (status) { if (status == ICE_ERR_ALREADY_EXISTS) {
err = -EADDRNOTAVAIL; netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
goto err_update_filters; return 0;
} }
/* error if the new filter addition failed */
if (status)
err = -EADDRNOTAVAIL;
err_update_filters: err_update_filters:
if (err) { if (err) {
netdev_err(netdev, "can't set MAC %pM. filter update failed\n", netdev_err(netdev, "can't set MAC %pM. filter update failed\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment