From 039c9802a1f8e52bccc4c3c9c752a4cb27641db7 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sun, 23 Nov 2025 12:43:28 +0100 Subject: [PATCH] realtek: Enclose complex macros in parentheses The macros will be inserted as is by the pre-compiler into places which uses them. This can cause weird effects because this can break the syntax or the ordering of operations. Just adding parentheses can avoid a lot of these unexpected effects. (for even more complex, multi-expression macros, `do {...} while (0)` is required). Signed-off-by: Sven Eckelmann Link: https://github.com/openwrt/openwrt/pull/20906 Signed-off-by: Hauke Mehrtens --- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c index f78f26db18..723772b5d3 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c @@ -14,7 +14,7 @@ #define RTL838X_VLAN_PORT_TAG_STS_CTRL_BASE 0xA530 /* port 0-28 */ #define RTL838X_VLAN_PORT_TAG_STS_CTRL(port) \ - RTL838X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2) + (RTL838X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2)) #define RTL838X_VLAN_PORT_TAG_STS_CTRL_EGR_P_OTAG_KEEP_MASK GENMASK(11,10) #define RTL838X_VLAN_PORT_TAG_STS_CTRL_EGR_P_ITAG_KEEP_MASK GENMASK(9,8) diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c index 28e8313aff..9a99879844 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c @@ -12,7 +12,7 @@ #define RTL839X_VLAN_PORT_TAG_STS_CTRL_BASE 0x6828 /* port 0-52 */ #define RTL839X_VLAN_PORT_TAG_STS_CTRL(port) \ - RTL839X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2) + (RTL839X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2)) #define RTL839X_VLAN_PORT_TAG_STS_CTRL_OTAG_STS_MASK GENMASK(7,6) #define RTL839X_VLAN_PORT_TAG_STS_CTRL_ITAG_STS_MASK GENMASK(5,4) #define RTL839X_VLAN_PORT_TAG_STS_CTRL_EGR_P_OTAG_KEEP_MASK GENMASK(3,3) diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c index a27fe195ab..bd860e7273 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c @@ -14,7 +14,7 @@ #define RTL930X_VLAN_PORT_TAG_STS_CTRL_BASE 0xCE24 /* port 0-28 */ #define RTL930X_VLAN_PORT_TAG_STS_CTRL(port) \ - RTL930X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2) + (RTL930X_VLAN_PORT_TAG_STS_CTRL_BASE + (port << 2)) #define RTL930X_VLAN_PORT_TAG_STS_CTRL_EGR_OTAG_STS_MASK GENMASK(7,6) #define RTL930X_VLAN_PORT_TAG_STS_CTRL_EGR_ITAG_STS_MASK GENMASK(5,4) #define RTL930X_VLAN_PORT_TAG_STS_CTRL_EGR_P_OTAG_KEEP_MASK GENMASK(3,3) diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c index a606116ead..d8a047f356 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c @@ -13,7 +13,7 @@ #define RTL931X_VLAN_PORT_TAG_CTRL_BASE 0x4860 /* port 0-56 */ #define RTL931X_VLAN_PORT_TAG_CTRL(port) \ - RTL931X_VLAN_PORT_TAG_CTRL_BASE + (port << 2) + (RTL931X_VLAN_PORT_TAG_CTRL_BASE + (port << 2)) #define RTL931X_VLAN_PORT_TAG_EGR_OTAG_STS_MASK GENMASK(13,12) #define RTL931X_VLAN_PORT_TAG_EGR_ITAG_STS_MASK GENMASK(11,10) #define RTL931X_VLAN_PORT_TAG_EGR_OTAG_KEEP_MASK GENMASK(9,9) -- 2.30.2