[PATCH] mt76: mt7915: fix misplaced #ifdef
Arnd Bergmann
arnd at kernel.org
Sun Jan 3 08:57:55 EST 2021
From: Arnd Bergmann <arnd at 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 at 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
More information about the linux-arm-kernel
mailing list