Skip to contentSkip to conversation

net: wireless/mediatek/mt7915: fix MESH ifdef block

PATCH In review Randy Dunlap 2 participants 5 messages Dec 18, 2020 – Dec 20, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
Cc Shayne Chen <[email protected]>
Cc Ryder Lee <[email protected]>
Cc Lorenzo Bianconi <[email protected]>
Cc Felix Fietkau <[email protected]>
Cc Kalle Valo <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt7915/init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +2 -2
@@ -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,
#1 lore raw
Quoted 6 lines · Randy Dunlap

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
}, {
^

Quoted 8 lines
Fixes af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
Cc Shayne Chen <[email protected]>
Cc Ryder Lee <[email protected]>
Cc Lorenzo Bianconi <[email protected]>
Cc Felix Fietkau <[email protected]>
Cc Kalle Valo <[email protected]>

Thanks, but why -next? I would rather queue this to wireless-drivers for v5.11 as af901eb4ab80 is in Linu's tree now.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#2 lore raw
Quoted 17 lines · Kalle Valo
Quoted 6 lines · Randy Dunlap

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
}, {
^

Quoted 8 lines
Fixes af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
Cc Shayne Chen <[email protected]>
Cc Ryder Lee <[email protected]>
Cc Lorenzo Bianconi <[email protected]>
Cc Felix Fietkau <[email protected]>
Cc Kalle Valo <[email protected]>
Quoted 3 lines

Thanks, but why -next? I would rather queue this to wireless-drivers for v5.11 as af901eb4ab80 is in Linu's tree now.

Sorry, I found the build error in linux-next.
My bad for not checking mainline.

Shall I resend it?

thanks.

Signature · 1 line
~Randy
#3 lore raw
Quoted 19 lines · Randy Dunlap
Quoted 18 lines · Kalle Valo
Quoted 15 lines · Randy Dunlap

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")
Cc Shayne Chen <[email protected]>
Cc Ryder Lee <[email protected]>
Cc Lorenzo Bianconi <[email protected]>
Cc Felix Fietkau <[email protected]>
Cc Kalle Valo <[email protected]>
Quoted 5 lines
Quoted 2 lines

Thanks, but why -next? I would rather queue this to wireless-drivers for v5.11 as af901eb4ab80 is in Linu's tree now.

Sorry, I found the build error in linux-next.
My bad for not checking mainline.

Ah.

Quoted 1 line

Shall I resend it?

No need, just wanted to make sure that I'm not missing anything. I'll queue this for v5.11.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#4 lore raw

Re: [-next] mt76: mt7915: fix MESH ifdef block

In reply to Randy Dunlap
Quoted 6 lines · Randy Dunlap

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
}, {
^

Quoted 8 lines
Fixes af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
Cc Shayne Chen <[email protected]>
Cc Ryder Lee <[email protected]>
Cc Lorenzo Bianconi <[email protected]>
Cc Felix Fietkau <[email protected]>
Cc Kalle Valo <[email protected]>

Patch applied to wireless-drivers.git, thanks.

0bd157fa2aaa mt76: mt7915: fix MESH ifdef block

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches