nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ice: Fix check for removing/adding mac filters

Browse source 
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: Lihong Yang <lihong.yang@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Lihong Yang 2020-05-07 17:41:09 -07:00 committed by Jeff Kirsher
parent 1b8f15b64a
commit 757976ab16
1 changed files with 10 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/ethernet/intel/ice/ice_main.c
View file

@ -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",