Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f434994 authored by Alan Brady's avatar Alan Brady Committed by Jeff Kirsher
Browse files

i40e: fix clearing link masks in i40e_get_link_ksettings 



This fixes two issues in i40e_get_link_ksettings.  It adds calls to
ethtool_link_ksettings_zero_link_mode to make sure advertising and
supported link masks are cleared before we start setting bits in them.

This also replaces some funky bit manipulations with a much nicer call
to ethtool_link_ksettings_del_link_mode when removing link modes.

Signed-off-by: default avatarAlan Brady <alan.brady@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 21675bdc

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+6 −8
Original line number Diff line number Diff line
@@ -600,7 +600,9 @@ static int i40e_get_link_ksettings(struct net_device *netdev, 
	struct i40e_hw *hw = &pf->hw;

	struct i40e_link_status *hw_link_info = &hw->phy.link_info;

	bool link_up = hw_link_info->link_info & I40E_AQ_LINK_UP;

	u32 advertising;



	ethtool_link_ksettings_zero_link_mode(ks, supported);

	ethtool_link_ksettings_zero_link_mode(ks, advertising);



	if (link_up)

		i40e_get_settings_link_up(hw, ks, netdev, pf);
@@ -664,13 +666,9 @@ static int i40e_get_link_ksettings(struct net_device *netdev, 
						     Asym_Pause);

		break;

	default:

		ethtool_convert_link_mode_to_legacy_u32(

			&advertising, ks->link_modes.advertising);



		advertising &= ~(ADVERTISED_Pause | ADVERTISED_Asym_Pause);



		ethtool_convert_legacy_u32_to_link_mode(

			ks->link_modes.advertising, advertising);

		ethtool_link_ksettings_del_link_mode(ks, advertising, Pause);

		ethtool_link_ksettings_del_link_mode(ks, advertising,

						     Asym_Pause);

		break;

	}