lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <e11d7e2f-34c0-4be4-9232-92c04d42ccb5@csgroup.eu>
Date: Sat, 15 Nov 2025 13:52:26 +0100
From: Christophe Leroy <christophe.leroy@...roup.eu>
To: Maxime Chevallier <maxime.chevallier@...tlin.com>, davem@...emloft.net
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
 linux-arm-msm@...r.kernel.org, thomas.petazzoni@...tlin.com,
 Andrew Lunn <andrew@...n.ch>, Jakub Kicinski <kuba@...nel.org>,
 Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>,
 Russell King <linux@...linux.org.uk>, linux-arm-kernel@...ts.infradead.org,
 Herve Codina <herve.codina@...tlin.com>,
 Florian Fainelli <f.fainelli@...il.com>,
 Heiner Kallweit <hkallweit1@...il.com>,
 Vladimir Oltean <vladimir.oltean@....com>,
 Köry Maincent <kory.maincent@...tlin.com>,
 Marek Behún <kabel@...nel.org>,
 Oleksij Rempel <o.rempel@...gutronix.de>,
 Nicolò Veronese <nicveronese@...il.com>,
 Simon Horman <horms@...nel.org>, mwojtas@...omium.org,
 Antoine Tenart <atenart@...nel.org>, devicetree@...r.kernel.org,
 Conor Dooley <conor+dt@...nel.org>, Krzysztof Kozlowski
 <krzk+dt@...nel.org>, Rob Herring <robh@...nel.org>,
 Romain Gantois <romain.gantois@...tlin.com>,
 Daniel Golle <daniel@...rotopia.org>,
 Dimitri Fedrau <dimitri.fedrau@...bherr.com>
Subject: Re: [PATCH net-next v16 02/15] net: ethtool: Introduce
 ETHTOOL_LINK_MEDIUM_* values



Le 13/11/2025 à 09:14, Maxime Chevallier a écrit :
> In an effort to have a better representation of Ethernet ports,
> introduce enumeration values representing the various ethernet Mediums.
> 
> This is part of the 802.3 naming convention, for example :
> 
> 1000 Base T 4
>   |    |   | |
>   |    |   | \_ pairs (4)
>   |    |   \___ Medium (T == Twisted Copper Pairs)
>   |    \_______ Baseband transmission
>   \____________ Speed
> 
>   Other example :
> 
> 10000 Base K X 4
>             | | \_ lanes (4)
>             | \___ encoding (BaseX is 8b/10b while BaseR is 66b/64b)
>             \_____ Medium (K is backplane ethernet)
> 
> In the case of representing a physical port, only the medium and number
> of pairs should be relevant. One exception would be 1000BaseX, which is
> currently also used as a medium in what appears to be any of
> 1000BaseSX, 1000BaseCX and 1000BaseLX. This was reflected in the mediums
> associated with the 1000BaseX linkmode.
> 
> These mediums are set in the net/ethtool/common.c lookup table that
> maintains a list of all linkmodes with their number of pairs, medium,
> encoding, speed and duplex.
> 
> One notable exception to this is 100M BaseT Ethernet. 100BaseTX is a
> 2-pairs protocol but it will also work on 4-pairs cables, so the lookup
> table contains 2 sets of pair numbers, indicating the min number of pairs
> for a protocol to work and the "nominal" number of pairs as well.
> 
> Another set of exceptions are linkmodes such 100000baseLR4_ER4, where
> the same link mode seems to represent 100GBaseLR4 and 100GBaseER4. The
> macro __DEFINE_LINK_MODE_PARAMS_MEDIUMS is here used to populate the
> .mediums bitfield with all appropriate mediums.
> 
> Reviewed-by: Andrew Lunn <andrew@...n.ch>
> Signed-off-by: Maxime Chevallier <maxime.chevallier@...tlin.com>

Reviewed-by: Christophe Leroy <christophe.leroy@...roup.eu>

> ---
>   drivers/net/phy/phy_caps.c   |   8 ++
>   include/linux/ethtool.h      |  19 ++-
>   include/uapi/linux/ethtool.h |  20 +++
>   net/ethtool/common.c         | 268 +++++++++++++++++++++--------------
>   4 files changed, 203 insertions(+), 112 deletions(-)
> 
> diff --git a/drivers/net/phy/phy_caps.c b/drivers/net/phy/phy_caps.c
> index 23c808b59b6f..9a5e293c5104 100644
> --- a/drivers/net/phy/phy_caps.c
> +++ b/drivers/net/phy/phy_caps.c
> @@ -78,6 +78,14 @@ int __init phy_caps_init(void)
>   	/* Fill the caps array from net/ethtool/common.c */
>   	for (i = 0; i < __ETHTOOL_LINK_MODE_MASK_NBITS; i++) {
>   		linkmode = &link_mode_params[i];
> +
> +		/* Sanity check the linkmodes array for number of pairs */
> +		if (linkmode->pairs < linkmode->min_pairs) {
> +			pr_err("Pairs count must not be under min_pairs for linkmode %d\n",
> +			       i);
> +			return -EINVAL;
> +		}
> +
>   		capa = speed_duplex_to_capa(linkmode->speed, linkmode->duplex);
>   
>   		if (capa < 0) {
> diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
> index c2d8b4ec62eb..ad2b5ed9522b 100644
> --- a/include/linux/ethtool.h
> +++ b/include/linux/ethtool.h
> @@ -216,13 +216,26 @@ static inline u8 *ethtool_rxfh_context_key(struct ethtool_rxfh_context *ctx)
>   void ethtool_rxfh_context_lost(struct net_device *dev, u32 context_id);
>   
>   struct link_mode_info {
> -	int                             speed;
> -	u8                              lanes;
> -	u8                              duplex;
> +	int	speed;
> +	u8	lanes;
> +	u8	min_pairs;
> +	u8	pairs;
> +	u8	duplex;
> +	u16	mediums;
>   };
>   
>   extern const struct link_mode_info link_mode_params[];
>   
> +extern const char ethtool_link_medium_names[][ETH_GSTRING_LEN];
> +
> +static inline const char *phy_mediums(enum ethtool_link_medium medium)
> +{
> +	if (medium >= __ETHTOOL_LINK_MEDIUM_LAST)
> +		return "unknown";
> +
> +	return ethtool_link_medium_names[medium];
> +}
> +
>   /* declare a link mode bitmap */
>   #define __ETHTOOL_DECLARE_LINK_MODE_MASK(name)		\
>   	DECLARE_BITMAP(name, __ETHTOOL_LINK_MODE_MASK_NBITS)
> diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
> index 8bd5ea5469d9..6ed235053aed 100644
> --- a/include/uapi/linux/ethtool.h
> +++ b/include/uapi/linux/ethtool.h
> @@ -2587,4 +2587,24 @@ enum phy_upstream {
>   	PHY_UPSTREAM_PHY,
>   };
>   
> +enum ethtool_link_medium {
> +	ETHTOOL_LINK_MEDIUM_BASET = 0,
> +	ETHTOOL_LINK_MEDIUM_BASEK,
> +	ETHTOOL_LINK_MEDIUM_BASES,
> +	ETHTOOL_LINK_MEDIUM_BASEC,
> +	ETHTOOL_LINK_MEDIUM_BASEL,
> +	ETHTOOL_LINK_MEDIUM_BASED,
> +	ETHTOOL_LINK_MEDIUM_BASEE,
> +	ETHTOOL_LINK_MEDIUM_BASEF,
> +	ETHTOOL_LINK_MEDIUM_BASEV,
> +	ETHTOOL_LINK_MEDIUM_BASEMLD,
> +	ETHTOOL_LINK_MEDIUM_NONE,
> +
> +	__ETHTOOL_LINK_MEDIUM_LAST,
> +};
> +
> +#define ETHTOOL_MEDIUM_FIBER_BITS (BIT(ETHTOOL_LINK_MEDIUM_BASES) | \
> +				   BIT(ETHTOOL_LINK_MEDIUM_BASEL) | \
> +				   BIT(ETHTOOL_LINK_MEDIUM_BASEF))
> +
>   #endif /* _UAPI_LINUX_ETHTOOL_H */
> diff --git a/net/ethtool/common.c b/net/ethtool/common.c
> index 55223ebc2a7e..bd6417dfb362 100644
> --- a/net/ethtool/common.c
> +++ b/net/ethtool/common.c
> @@ -281,12 +281,35 @@ static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);
>   #define __LINK_MODE_LANES_DR8_2		8
>   #define __LINK_MODE_LANES_T1BRR		1
>   
> -#define __DEFINE_LINK_MODE_PARAMS(_speed, _type, _duplex)	\
> +#define __DEFINE_LINK_MODE_PARAMS_PAIRS(_speed, _type, _min_pairs, _pairs, _duplex, _medium) \
>   	[ETHTOOL_LINK_MODE(_speed, _type, _duplex)] = {		\
>   		.speed  = SPEED_ ## _speed, \
>   		.lanes  = __LINK_MODE_LANES_ ## _type, \
> -		.duplex	= __DUPLEX_ ## _duplex \
> +		.min_pairs = _min_pairs, \
> +		.pairs = _pairs, \
> +		.duplex	= __DUPLEX_ ## _duplex, \
> +		.mediums = BIT(ETHTOOL_LINK_MEDIUM_BASE ## _medium) \
>   	}
> +
> +#define __DEFINE_LINK_MODE_PARAMS(_speed, _type, _duplex, _medium)	\
> +	[ETHTOOL_LINK_MODE(_speed, _type, _duplex)] = {		\
> +		.speed  = SPEED_ ## _speed, \
> +		.lanes  = __LINK_MODE_LANES_ ## _type, \
> +		.min_pairs = 0, \
> +		.pairs = 0, \
> +		.duplex	= __DUPLEX_ ## _duplex, \
> +		.mediums = BIT(ETHTOOL_LINK_MEDIUM_BASE ## _medium) \
> +	}
> +#define __DEFINE_LINK_MODE_PARAMS_MEDIUMS(_speed, _type, _duplex, _mediums)	\
> +	[ETHTOOL_LINK_MODE(_speed, _type, _duplex)] = {		\
> +		.speed  = SPEED_ ## _speed, \
> +		.lanes  = __LINK_MODE_LANES_ ## _type, \
> +		.min_pairs = 0, \
> +		.pairs = 0, \
> +		.duplex	= __DUPLEX_ ## _duplex, \
> +		.mediums = (_mediums) \
> +	}
> +#define __MED(_medium)	(BIT(ETHTOOL_LINK_MEDIUM_BASE ## _medium))
>   #define __DUPLEX_Half DUPLEX_HALF
>   #define __DUPLEX_Full DUPLEX_FULL
>   #define __DEFINE_SPECIAL_MODE_PARAMS(_mode) \
> @@ -294,138 +317,165 @@ static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);
>   		.speed	= SPEED_UNKNOWN, \
>   		.lanes	= 0, \
>   		.duplex	= DUPLEX_UNKNOWN, \
> +		.mediums = BIT(ETHTOOL_LINK_MEDIUM_NONE), \
>   	}
>   
>   const struct link_mode_info link_mode_params[] = {
> -	__DEFINE_LINK_MODE_PARAMS(10, T, Half),
> -	__DEFINE_LINK_MODE_PARAMS(10, T, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100, T, Half),
> -	__DEFINE_LINK_MODE_PARAMS(100, T, Full),
> -	__DEFINE_LINK_MODE_PARAMS(1000, T, Half),
> -	__DEFINE_LINK_MODE_PARAMS(1000, T, Full),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10, T, 2, 4, Half, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10, T, 2, 4, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(100, T, 2, 4, Half, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(100, T, 2, 4, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(1000, T, 4, 4, Half, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(1000, T, 4, 4, Full, T),
>   	__DEFINE_SPECIAL_MODE_PARAMS(Autoneg),
>   	__DEFINE_SPECIAL_MODE_PARAMS(TP),
>   	__DEFINE_SPECIAL_MODE_PARAMS(AUI),
>   	__DEFINE_SPECIAL_MODE_PARAMS(MII),
>   	__DEFINE_SPECIAL_MODE_PARAMS(FIBRE),
>   	__DEFINE_SPECIAL_MODE_PARAMS(BNC),
> -	__DEFINE_LINK_MODE_PARAMS(10000, T, Full),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10000, T, 4, 4, Full, T),
>   	__DEFINE_SPECIAL_MODE_PARAMS(Pause),
>   	__DEFINE_SPECIAL_MODE_PARAMS(Asym_Pause),
> -	__DEFINE_LINK_MODE_PARAMS(2500, X, Full),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(2500, X, Full,
> +					  __MED(C) | __MED(S) | __MED(L)),
>   	__DEFINE_SPECIAL_MODE_PARAMS(Backplane),
> -	__DEFINE_LINK_MODE_PARAMS(1000, KX, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10000, KX4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10000, KR, Full),
> +	__DEFINE_LINK_MODE_PARAMS(1000, KX, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(10000, KX4, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(10000, KR, Full, K),
>   	[ETHTOOL_LINK_MODE_10000baseR_FEC_BIT] = {
>   		.speed	= SPEED_10000,
>   		.lanes	= 1,
>   		.duplex = DUPLEX_FULL,
>   	},
> -	__DEFINE_LINK_MODE_PARAMS(20000, MLD2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(20000, KR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(40000, KR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(40000, CR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(40000, SR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(40000, LR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(56000, KR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(56000, CR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(56000, SR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(56000, LR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(25000, CR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(25000, KR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(25000, SR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(50000, CR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(50000, KR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, KR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, SR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, CR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, LR4_ER4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(50000, SR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(1000, X, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10000, CR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10000, SR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10000, LR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10000, LRM, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10000, ER, Full),
> -	__DEFINE_LINK_MODE_PARAMS(2500, T, Full),
> -	__DEFINE_LINK_MODE_PARAMS(5000, T, Full),
> +	__DEFINE_LINK_MODE_PARAMS(20000, MLD2, Full, MLD),
> +	__DEFINE_LINK_MODE_PARAMS(20000, KR2, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(40000, KR4, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(40000, CR4, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(40000, SR4, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(40000, LR4, Full, L),
> +	__DEFINE_LINK_MODE_PARAMS(56000, KR4, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(56000, CR4, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(56000, SR4, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(56000, LR4, Full, L),
> +	__DEFINE_LINK_MODE_PARAMS(25000, CR, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(25000, KR, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(25000, SR, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(50000, CR2, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(50000, KR2, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(100000, KR4, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(100000, SR4, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(100000, CR4, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(100000, LR4_ER4, Full,
> +					  __MED(L) | __MED(E)),
> +	__DEFINE_LINK_MODE_PARAMS(50000, SR2, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(1000, X, Full,
> +					  __MED(C) | __MED(S) | __MED(L)),
> +	__DEFINE_LINK_MODE_PARAMS(10000, CR, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(10000, SR, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(10000, LR, Full, L),
> +	__DEFINE_LINK_MODE_PARAMS(10000, LRM, Full, L),
> +	__DEFINE_LINK_MODE_PARAMS(10000, ER, Full, E),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(2500, T, 4, 4, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(5000, T, 4, 4, Full, T),
>   	__DEFINE_SPECIAL_MODE_PARAMS(FEC_NONE),
>   	__DEFINE_SPECIAL_MODE_PARAMS(FEC_RS),
>   	__DEFINE_SPECIAL_MODE_PARAMS(FEC_BASER),
> -	__DEFINE_LINK_MODE_PARAMS(50000, KR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(50000, SR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(50000, CR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(50000, LR_ER_FR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(50000, DR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, KR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, SR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, CR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, LR2_ER2_FR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, DR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, KR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, SR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, LR4_ER4_FR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, DR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, CR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100, T1, Full),
> -	__DEFINE_LINK_MODE_PARAMS(1000, T1, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, KR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, SR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, LR8_ER8_FR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, DR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, CR8, Full),
> +	__DEFINE_LINK_MODE_PARAMS(50000, KR, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(50000, SR, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(50000, CR, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(50000, LR_ER_FR, Full,
> +					  __MED(L) | __MED(E) | __MED(F)),
> +	__DEFINE_LINK_MODE_PARAMS(50000, DR, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(100000, KR2, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(100000, SR2, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(100000, CR2, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(100000, LR2_ER2_FR2, Full,
> +					  __MED(L) | __MED(E) | __MED(F)),
> +	__DEFINE_LINK_MODE_PARAMS(100000, DR2, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(200000, KR4, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(200000, SR4, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(200000, LR4_ER4_FR4, Full,
> +					  __MED(L) | __MED(E) | __MED(F)),
> +	__DEFINE_LINK_MODE_PARAMS(200000, DR4, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(200000, CR4, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(100, T1, 1, 1, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(1000, T1, 1, 1, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS(400000, KR8, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(400000, SR8, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(400000, LR8_ER8_FR8, Full,
> +					  __MED(L) | __MED(E) | __MED(F)),
> +	__DEFINE_LINK_MODE_PARAMS(400000, DR8, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(400000, CR8, Full, C),
>   	__DEFINE_SPECIAL_MODE_PARAMS(FEC_LLRS),
> -	__DEFINE_LINK_MODE_PARAMS(100000, KR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, SR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, LR_ER_FR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, DR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100000, CR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, KR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, SR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, LR2_ER2_FR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, DR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, CR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, KR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, SR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, LR4_ER4_FR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, DR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, CR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(100, FX, Half),
> -	__DEFINE_LINK_MODE_PARAMS(100, FX, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10, T1L, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, CR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, KR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, DR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, DR8_2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, SR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, VR8, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10, T1S, Full),
> -	__DEFINE_LINK_MODE_PARAMS(10, T1S, Half),
> -	__DEFINE_LINK_MODE_PARAMS(10, T1S_P2MP, Half),
> -	__DEFINE_LINK_MODE_PARAMS(10, T1BRR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, CR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, KR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, DR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, DR_2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, SR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(200000, VR, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, CR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, KR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, DR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, DR2_2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, SR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(400000, VR2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, CR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, KR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, DR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, DR4_2, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, SR4, Full),
> -	__DEFINE_LINK_MODE_PARAMS(800000, VR4, Full),
> +	__DEFINE_LINK_MODE_PARAMS(100000, KR, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(100000, SR, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(100000, LR_ER_FR, Full,
> +					  __MED(L) | __MED(E) | __MED(F)),
> +	__DEFINE_LINK_MODE_PARAMS(100000, DR, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(100000, CR, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(200000, KR2, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(200000, SR2, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(200000, LR2_ER2_FR2, Full,
> +					  __MED(L) | __MED(E) | __MED(F)),
> +	__DEFINE_LINK_MODE_PARAMS(200000, DR2, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(200000, CR2, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(400000, KR4, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(400000, SR4, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS_MEDIUMS(400000, LR4_ER4_FR4, Full,
> +					  __MED(L) | __MED(E) | __MED(F)),
> +	__DEFINE_LINK_MODE_PARAMS(400000, DR4, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(400000, CR4, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(100, FX, Half, F),
> +	__DEFINE_LINK_MODE_PARAMS(100, FX, Full, F),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10, T1L, 1, 1, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS(800000, CR8, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(800000, KR8, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(800000, DR8, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(800000, DR8_2, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(800000, SR8, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(800000, VR8, Full, V),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10, T1S, 1, 1, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10, T1S, 1, 1, Half, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10, T1S_P2MP, 1, 1, Half, T),
> +	__DEFINE_LINK_MODE_PARAMS_PAIRS(10, T1BRR, 1, 1, Full, T),
> +	__DEFINE_LINK_MODE_PARAMS(200000, CR, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(200000, KR, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(200000, DR, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(200000, DR_2, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(200000, SR, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(200000, VR, Full, V),
> +	__DEFINE_LINK_MODE_PARAMS(400000, CR2, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(400000, KR2, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(400000, DR2, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(400000, DR2_2, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(400000, SR2, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(400000, VR2, Full, V),
> +	__DEFINE_LINK_MODE_PARAMS(800000, CR4, Full, C),
> +	__DEFINE_LINK_MODE_PARAMS(800000, KR4, Full, K),
> +	__DEFINE_LINK_MODE_PARAMS(800000, DR4, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(800000, DR4_2, Full, D),
> +	__DEFINE_LINK_MODE_PARAMS(800000, SR4, Full, S),
> +	__DEFINE_LINK_MODE_PARAMS(800000, VR4, Full, V),
>   };
>   static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS);
>   EXPORT_SYMBOL_GPL(link_mode_params);
>   
> +const char ethtool_link_medium_names[][ETH_GSTRING_LEN] = {
> +	[ETHTOOL_LINK_MEDIUM_BASET] = "BaseT",
> +	[ETHTOOL_LINK_MEDIUM_BASEK] = "BaseK",
> +	[ETHTOOL_LINK_MEDIUM_BASES] = "BaseS",
> +	[ETHTOOL_LINK_MEDIUM_BASEC] = "BaseC",
> +	[ETHTOOL_LINK_MEDIUM_BASEL] = "BaseL",
> +	[ETHTOOL_LINK_MEDIUM_BASED] = "BaseD",
> +	[ETHTOOL_LINK_MEDIUM_BASEE] = "BaseE",
> +	[ETHTOOL_LINK_MEDIUM_BASEF] = "BaseF",
> +	[ETHTOOL_LINK_MEDIUM_BASEV] = "BaseV",
> +	[ETHTOOL_LINK_MEDIUM_BASEMLD] = "BaseMLD",
> +	[ETHTOOL_LINK_MEDIUM_NONE] = "None",
> +};
> +static_assert(ARRAY_SIZE(ethtool_link_medium_names) == __ETHTOOL_LINK_MEDIUM_LAST);
> +EXPORT_SYMBOL_GPL(ethtool_link_medium_names);
> +
>   const char netif_msg_class_names[][ETH_GSTRING_LEN] = {
>   	[NETIF_MSG_DRV_BIT]		= "drv",
>   	[NETIF_MSG_PROBE_BIT]		= "probe",


Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ