linux-kernel - [PATCH -next] net: wireless/mediatek/mt7915: fix MESH ifdef block

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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 18 Dec 2020 09:32:02 -0800
From:   Randy Dunlap <rdunlap@...radead.org>
To:     linux-kernel@...r.kernel.org
Cc:     Randy Dunlap <rdunlap@...radead.org>,
        Shayne Chen <shayne.chen@...iatek.com>,
        Ryder Lee <ryder.lee@...iatek.com>,
        Lorenzo Bianconi <lorenzo@...nel.org>,
        Felix Fietkau <nbd@....name>, linux-wireless@...r.kernel.org,
        Kalle Valo <kvalo@...eaurora.org>
Subject: [PATCH -next] net: wireless/mediatek/mt7915: fix MESH ifdef block

Fix a build error when CONFIG_MAC80211_MESH is not enabled:

../drivers/net/wireless/mediatek/mt76/mt7915/init.c:47:2: error: expected expression before '}' token
  }, {
  ^

Fixes: af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
Signed-off-by: Randy Dunlap <rdunlap@...radead.org>
Cc: Shayne Chen <shayne.chen@...iatek.com>
Cc: Ryder Lee <ryder.lee@...iatek.com>
Cc: Lorenzo Bianconi <lorenzo@...nel.org>
Cc: Felix Fietkau <nbd@....name>
Cc: linux-wireless@...r.kernel.org
Cc: Kalle Valo <kvalo@...eaurora.org>
---
 drivers/net/wireless/mediatek/mt76/mt7915/init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-next-20201218.orig/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ linux-next-20201218/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -40,9 +40,9 @@ static const struct ieee80211_iface_limi
 		.types = BIT(NL80211_IFTYPE_ADHOC)
 	}, {
 		.max = 16,
-		.types = BIT(NL80211_IFTYPE_AP) |
+		.types = BIT(NL80211_IFTYPE_AP)
 #ifdef CONFIG_MAC80211_MESH
-			 BIT(NL80211_IFTYPE_MESH_POINT)
+			 | BIT(NL80211_IFTYPE_MESH_POINT)
 #endif
 	}, {
 		.max = MT7915_MAX_INTERFACES,