Commit 9d20797f authored by Przemek Kitszel's avatar Przemek Kitszel Committed by Tony Nguyen
Browse files

ice: combine cases in ice_ksettings_find_adv_link_speed() 



Combine if statements setting the same link speed together.

Suggested-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Acked-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 2481e820

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

+8 −12
Original line number Diff line number Diff line
@@ -2259,17 +2259,15 @@ ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks) 
						  100baseT_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_100MB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  1000baseX_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_1000MB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  1000baseX_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  1000baseT_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  1000baseKX_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_1000MB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  2500baseT_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_2500MB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  2500baseT_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  2500baseX_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_2500MB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,
@@ -2278,9 +2276,8 @@ ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks) 
	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  10000baseT_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  10000baseKR_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_10GB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  10000baseKR_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  10000baseSR_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  10000baseLR_Full))
@@ -2304,9 +2301,8 @@ ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks) 
	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  50000baseCR2_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  50000baseKR2_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_50GB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  50000baseKR2_Full) ||

	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  50000baseSR2_Full))

		adv_link_speed |= ICE_AQ_LINK_SPEED_50GB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,