ice: Fix check for removing/adding mac filters (757976ab) · Commits · 戴 / test

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>

drivers/net/ethernet/intel/ice/ice_main.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -3707,19 +3707,24 @@ static int ice_set_mac_address(struct net_device netdev, void pi)
		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);
		if (status) {
		if (status && status != ICE_ERR_DOES_NOT_EXIST) {
		err = -EADDRNOTAVAIL;
		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);
		if (status) {
		err = -EADDRNOTAVAIL;
		goto err_update_filters;
		if (status == ICE_ERR_ALREADY_EXISTS) {
		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
		return 0;
		}

		/* error if the new filter addition failed */
		if (status)
		err = -EADDRNOTAVAIL;

		err_update_filters:
		if (err) {
		netdev_err(netdev, "can't set MAC %pM. filter update failed\n",

Admin message