Skip to content

Commit 919361f

Browse files
committed
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: 155c610 ("airoha: backport additional patch for memory leak and multi-serdes rework") (cherry picked from commit 3187113) Link: openwrt/openwrt#23046 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
1 parent 49d7ee7 commit 919361f

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

target/linux/airoha/patches-6.12/141-v7.1-net-airoha-Fix-VIP-configuration-for-AN7583-SoC.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
6363
if (src_port < 0)
6464
return src_port;
6565

66+
@@ -1784,7 +1770,7 @@ static int airhoha_set_gdm2_loopback(str
67+
__field_prep(SP_CPORT_MASK(val), FE_PSE_PORT_CDM2));
68+
69+
if (port->id == AIROHA_GDM4_IDX && airoha_is_7581(eth)) {
70+
- u32 mask = FC_ID_OF_SRC_PORT_MASK(nbq);
71+
+ u32 mask = FC_ID_OF_SRC_PORT_MASK(port->nbq);
72+
73+
airoha_fe_rmw(eth, REG_SRC_PORT_FC_MAP6, mask,
74+
__field_prep(mask, AIROHA_GDM2_IDX));
6675
@@ -2962,6 +2948,8 @@ static int airoha_alloc_gdm_port(struct
6776
port->eth = eth;
6877
port->dev = dev;

0 commit comments

Comments
 (0)