From 3187113c8ae89e9c17c2e81c5f693f4d66d11962 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 15 Apr 2026 14:38:08 +0200 Subject: [PATCH] airoha: fix compilation error from VIP backport patch It seems that upstream one of the patch had a compilation erro caused by merging net and net-next and it was fixed silently in a merge commit. Fix this error in the affected patch. Fixes: 155c610962af ("airoha: backport additional patch for memory leak and multi-serdes rework") Signed-off-by: Christian Marangi --- ...net-airoha-Fix-VIP-configuration-for-AN7583-SoC.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/linux/airoha/patches-6.12/141-v7.1-net-airoha-Fix-VIP-configuration-for-AN7583-SoC.patch b/target/linux/airoha/patches-6.12/141-v7.1-net-airoha-Fix-VIP-configuration-for-AN7583-SoC.patch index 23dcf6e1cd..6b659879b5 100644 --- a/target/linux/airoha/patches-6.12/141-v7.1-net-airoha-Fix-VIP-configuration-for-AN7583-SoC.patch +++ b/target/linux/airoha/patches-6.12/141-v7.1-net-airoha-Fix-VIP-configuration-for-AN7583-SoC.patch @@ -63,6 +63,15 @@ Signed-off-by: Paolo Abeni if (src_port < 0) return src_port; +@@ -1784,7 +1770,7 @@ static int airhoha_set_gdm2_loopback(str + __field_prep(SP_CPORT_MASK(val), FE_PSE_PORT_CDM2)); + + if (port->id == AIROHA_GDM4_IDX && airoha_is_7581(eth)) { +- u32 mask = FC_ID_OF_SRC_PORT_MASK(nbq); ++ u32 mask = FC_ID_OF_SRC_PORT_MASK(port->nbq); + + airoha_fe_rmw(eth, REG_SRC_PORT_FC_MAP6, mask, + __field_prep(mask, AIROHA_GDM2_IDX)); @@ -2962,6 +2948,8 @@ static int airoha_alloc_gdm_port(struct port->eth = eth; port->dev = dev;