net: airoha: simplify WAN device check in airoha_dev_init()
Subsystems (4)
Lorenzo Bianconi
maintainerPATCH v2 1/1 net: airoha: simplify WAN device check in airoha_dev_init()
airoha_register_gdm_devices() iterates eth->ports[] in order, so GDM2's netdev is always registered before GDM3/GDM4. This means the explicit check for eth->ports[1] && eth->ports[1]->devs[0] is a redundant special-case of what airoha_get_wan_gdm_dev() already covers, since GDM2 is always marked as WAN during its own ndo_init.
Remove the redundant check and rely solely on airoha_get_wan_gdm_dev() which handles both the GDM2-present and GDM2-absent cases.
---
Changes in v2:
- Rebase on top of net-next.
- Link to v1: https://lore.kernel.org/r/20260606-airoha-eth-simplify-dev-init-v1-1-f08f8e404049@kernel.org
--- drivers/net/ethernet/airoha/airoha_eth.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/net/ethernet/airoha/airoha_eth.c +2 -10
@@ -2004,18 +2004,10 @@ static int airoha_dev_init(struct net_device *netdev)switch (port->id) {case AIROHA_GDM3_IDX : -case AIROHA_GDM4_IDX : { -struct airoha_eth *eth = dev->eth; - -/* GDM2 supports a single net_device */ -if (eth->ports[1 ] && eth->ports[1 ]->devs[0 ]) -break ; - -if (airoha_get_wan_gdm_dev (eth)) +case AIROHA_GDM4_IDX : +if (airoha_get_wan_gdm_dev (dev->eth))break ; - fallthrough; - }case AIROHA_GDM2_IDX :/* GDM2 is always used as wan */ dev->flags |=AIROHA_PRIV_F_WAN ;
---
base-commit: 5855479abc796c3b5d7b2f2ca147d68fc56cae1f
change-id: 20260606-airoha-eth-simplify-dev-init-5d53c7cc004e
Best regards,
Signature · 1 line
Lorenzo Bianconi <[email protected]>
From: Lorenzo Bianconi <[email protected]>
Date: Wed, 10 Jun 2026 15:25:13 +0200
Quoted 9 lines
airoha_register_gdm_devices()iterates eth->ports[] in order, so GDM2's netdev is always registered before GDM3/GDM4. This means the explicit check for eth->ports[1] && eth->ports[1]->devs[0] is a redundant special-case of whatairoha_get_wan_gdm_dev()already covers, since GDM2 is always marked as WAN during its ownndo_init.
Remove the redundant check and rely solely onairoha_get_wan_gdm_dev()which handles both the GDM2-present and GDM2-absent cases.Signed-off-by Lorenzo Bianconi <[email protected]>
Thanks,
Olek
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Wed, 10 Jun 2026 15:25:13 +0200 you wrote:
airoha_register_gdm_devices()iterates eth->ports[] in order, so GDM2's netdev is always registered before GDM3/GDM4. This means the explicit check for eth->ports[1] && eth->ports[1]->devs[0] is a redundant special-case of whatairoha_get_wan_gdm_dev()already covers, since GDM2 is always marked as WAN during its ownndo_init.
Remove the redundant check and rely solely onairoha_get_wan_gdm_dev()which handles both the GDM2-present and GDM2-absent cases.[...]
Here is the summary with links:
- [net-next,v2] net: airoha: simplify WAN device check in airoha_dev_init()
https://git.kernel.org/netdev/net-next/c/9912dfa2d46a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html