Re: [PATCH net v3 2/3] net: txgbe: distinguish module types by checking identifier
From: Matthieu Baerts <matttbe@kernel.org>
Date: 2026-06-11 12:57:14
Hi Jiawen, On 08/06/2026 09:08, Jiawen Wu wrote:
quoted hunk ↗ jump to hunk
Rework txgbe_identify_module() to validate module identifiers through explicit type checks instead of relying on transceiver_type heuristics. When using the SFP module, transceiver_type could be a random value, because it was read from an invalid register. Fixes: 57d39faed4c9 ("net: txgbe: improve functions of AML 40G devices") Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> --- drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c index a7e81f9e1be1..bdac654a2364 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c@@ -357,18 +357,16 @@ int txgbe_identify_module(struct wx *wx) } id = &buffer.id; - if (id->identifier != TXGBE_SFF_IDENTIFIER_SFP && - id->identifier != TXGBE_SFF_IDENTIFIER_QSFP && - id->identifier != TXGBE_SFF_IDENTIFIER_QSFP_PLUS && - id->identifier != TXGBE_SFF_IDENTIFIER_QSFP28) { - wx_err(wx, "Invalid module\n"); - return -ENODEV;
FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':
f2df54ddbfb0 ("net: txgbe: distinguish module types by checking
identifier")
and this one from 'net-next':
f67aead16e85 ("net: txgbe: rework service event handling")
----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.
The conflict has been resolved on our side [1]. Please report any issues
linked to this conflict resolution as it might be used by others. If you
worked on the mentioned patches, don't hesitate to ACK this conflict
resolution.
---------------------------
Regarding this conflict, I took the version from net-next, which
includes the new return using -EINVAL instead of -ENODEV like above.
Rerere cache is available in [2].
Cheers,
Matt
1: https://github.com/multipath-tcp/mptcp_net-next/commit/a8d41e018cc6
2: https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/88eeb
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.