diff options
| author | Christian Marangi | 2026-04-15 12:38:08 +0000 |
|---|---|---|
| committer | Christian Marangi | 2026-04-29 06:44:09 +0000 |
| commit | 919361fdb8e2f17244a6145fc6101c9abd750ad5 (patch) | |
| tree | 56b27f66605429dbf3070644ff1e346d001cf804 | |
| parent | 49d7ee7d5bd57929550ae85cb786876acbb60966 (diff) | |
| download | openwrt-919361fdb8e2f17244a6145fc6101c9abd750ad5.tar.gz | |
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")
(cherry picked from commit 3187113c8ae89e9c17c2e81c5f693f4d66d11962)
Link: https://github.com/openwrt/openwrt/pull/23046
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
| -rw-r--r-- | target/linux/airoha/patches-6.12/141-v7.1-net-airoha-Fix-VIP-configuration-for-AN7583-SoC.patch | 9 |
1 files changed, 9 insertions, 0 deletions
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 <pabeni@redhat.com> 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; |