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

Commit e728fdf0 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: improve definition of __ETHTOOL_LINK_MODE_MASK_NBITS 



The way to define __ETHTOOL_LINK_MODE_MASK_NBITS seems to be overly
complicated, go with a standard approach instead.
Whilst we're at it, move the comment to the right place.

v2:
- rebased

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fad4271b

include/linux/ethtool.h

+0 −4
Original line number Diff line number Diff line
@@ -98,10 +98,6 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings) 
	return index % n_rx_rings;

}



/* number of link mode bits/ulongs handled internally by kernel */

#define __ETHTOOL_LINK_MODE_MASK_NBITS			\

	(__ETHTOOL_LINK_MODE_LAST + 1)



/* declare a link mode bitmap */

#define __ETHTOOL_DECLARE_LINK_MODE_MASK(name)		\

	DECLARE_BITMAP(name, __ETHTOOL_LINK_MODE_MASK_NBITS)

include/uapi/linux/ethtool.h

+9 −8
Original line number Diff line number Diff line
@@ -1432,6 +1432,13 @@ enum ethtool_link_mode_bit_indices { 
	ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT	= 29,

	ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT	= 30,

	ETHTOOL_LINK_MODE_25000baseCR_Full_BIT	= 31,



	/* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit

	 * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*

	 * macro for bits > 31. The only way to use indices > 31 is to

	 * use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.

	 */



	ETHTOOL_LINK_MODE_25000baseKR_Full_BIT	= 32,

	ETHTOOL_LINK_MODE_25000baseSR_Full_BIT	= 33,

	ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT	= 34,
@@ -1469,14 +1476,8 @@ enum ethtool_link_mode_bit_indices { 
	ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT	 = 65,

	ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT	 = 66,



	/* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit

	 * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*

	 * macro for bits > 31. The only way to use indices > 31 is to

	 * use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.

	 */



	__ETHTOOL_LINK_MODE_LAST

	  = ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT,

	/* must be last entry */

	__ETHTOOL_LINK_MODE_MASK_NBITS

};



#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name)	\