* [PATCH] mt76: mt7915: fix misplaced #ifdef
@ 2021-01-03 13:57 Arnd Bergmann
2021-01-06 13:58 ` Petr Štetiar
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2021-01-03 13:57 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Ryder Lee, Arnd Bergmann, netdev, linux-wireless, linux-kernel,
Yiwei Chung, linux-mediatek, linux-arm-kernel, Matthias Brugger,
Jakub Kicinski, David S. Miller, Kalle Valo, Shayne Chen
From: Arnd Bergmann <arnd@arndb.de>
The lone '|' at the end of a line causes a build failure:
drivers/net/wireless/mediatek/mt76/mt7915/init.c:47:2: error: expected expression before '}' token
Replace the #ifdef with an equivalent IS_ENABLED() check.
Fixes: af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wireless/mediatek/mt76/mt7915/init.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index ed4635bd151a..f1fb3ae0f7f2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -40,10 +40,9 @@ static const struct ieee80211_iface_limit if_limits[] = {
.types = BIT(NL80211_IFTYPE_ADHOC)
}, {
.max = 16,
- .types = BIT(NL80211_IFTYPE_AP) |
-#ifdef CONFIG_MAC80211_MESH
- BIT(NL80211_IFTYPE_MESH_POINT)
-#endif
+ .types = BIT(NL80211_IFTYPE_AP)
+ | IS_ENABLED(CONFIG_MAC80211_MESH) ?
+ BIT(NL80211_IFTYPE_MESH_POINT) : 0
}, {
.max = MT7915_MAX_INTERFACES,
.types = BIT(NL80211_IFTYPE_STATION)
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mt76: mt7915: fix misplaced #ifdef
2021-01-03 13:57 [PATCH] mt76: mt7915: fix misplaced #ifdef Arnd Bergmann
@ 2021-01-06 13:58 ` Petr Štetiar
0 siblings, 0 replies; 2+ messages in thread
From: Petr Štetiar @ 2021-01-06 13:58 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ryder Lee, Arnd Bergmann, netdev, linux-wireless, linux-kernel,
Matthias Brugger, Yiwei Chung, linux-mediatek, linux-arm-kernel,
Lorenzo Bianconi, Jakub Kicinski, Shayne Chen, David S. Miller,
Kalle Valo, Felix Fietkau
Arnd Bergmann <arnd@kernel.org> [2021-01-03 14:57:55]:
Hi,
just a small nitpick,
> From: Arnd Bergmann <arnd@arndb.de>
>
> The lone '|' at the end of a line causes a build failure:
>
> drivers/net/wireless/mediatek/mt76/mt7915/init.c:47:2: error: expected expression before '}' token
>
> Replace the #ifdef with an equivalent IS_ENABLED() check.
>
> Fixes: af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
I think, that the correct fixes tag is following:
Fixes: 8aa2c6f4714e ("mt76: mt7915: support 32 station interfaces")
I've used the af901eb4ab80 as well first in
https://github.com/openwrt/mt76/pull/490 but then looked at it once more and
actually found the probably correct 8aa2c6f4714e.
Cheers,
Petr
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-06 14:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-03 13:57 [PATCH] mt76: mt7915: fix misplaced #ifdef Arnd Bergmann
2021-01-06 13:58 ` Petr Štetiar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).