lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 3 Jan 2021 14:57:55 +0100 From: Arnd Bergmann <arnd@...nel.org> To: Felix Fietkau <nbd@....name>, Lorenzo Bianconi <lorenzo.bianconi83@...il.com> Cc: Arnd Bergmann <arnd@...db.de>, Ryder Lee <ryder.lee@...iatek.com>, Kalle Valo <kvalo@...eaurora.org>, "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Matthias Brugger <matthias.bgg@...il.com>, Shayne Chen <shayne.chen@...iatek.com>, Yiwei Chung <yiwei.chung@...iatek.com>, linux-wireless@...r.kernel.org, netdev@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, linux-mediatek@...ts.infradead.org, linux-kernel@...r.kernel.org Subject: [PATCH] mt76: mt7915: fix misplaced #ifdef From: Arnd Bergmann <arnd@...db.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@...db.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
Powered by blists - more mailing lists