Commit 13ed5e8a authored by Nick Nunley's avatar Nick Nunley Committed by Tony Nguyen
Browse files

ice: update dev_addr in ice_set_mac_address even if HW filter exists 



Fix the driver to copy the MAC address configured in ndo_set_mac_address
into dev_addr, even if the MAC filter already exists in HW. In some
situations (e.g. bonding) the netdev's dev_addr could have been modified
outside of the driver, with no change to the HW filter, so the driver
cannot assume that they match.

Fixes: 757976ab ("ice: Fix check for removing/adding mac filters")
Signed-off-by: default avatarNick Nunley <nicholas.d.nunley@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 1b0b0b58

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

+7 −1
Original line number Diff line number Diff line
@@ -4884,9 +4884,15 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi) 
		goto err_update_filters;

	}



	/* Add filter for new MAC. If filter exists, just return success */

	/* Add filter for new MAC. If filter exists, return success */

	status = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);

	if (status == ICE_ERR_ALREADY_EXISTS) {

		/* Although this MAC filter is already present in hardware it's

		 * possible in some cases (e.g. bonding) that dev_addr was

		 * modified outside of the driver and needs to be restored back

		 * to this value.

		 */

		memcpy(netdev->dev_addr, mac, netdev->addr_len);

		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);

		return 0;

	}