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

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

[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")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Shayne Chen <shayne.chen@mediatek.com>
Cc: Ryder Lee <ryder.lee@mediatek.com>
Cc: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: linux-wireless@vger.kernel.org
Cc: Kalle Valo <kvalo@codeaurora.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,

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

[Kalle Valo]

Randy Dunlap <rdunlap@infradead.org> writes:

> 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@infradead.org>
> Cc: Shayne Chen <shayne.chen@mediatek.com>
> Cc: Ryder Lee <ryder.lee@mediatek.com>
> Cc: Lorenzo Bianconi <lorenzo@kernel.org>
> Cc: Felix Fietkau <nbd@nbd.name>
> Cc: linux-wireless@vger.kernel.org
> Cc: Kalle Valo <kvalo@codeaurora.org>

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

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

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

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

[Randy Dunlap]

On 12/18/20 10:48 AM, Kalle Valo wrote:
> Randy Dunlap <rdunlap@infradead.org> writes:
> 
>> 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@infradead.org>
>> Cc: Shayne Chen <shayne.chen@mediatek.com>
>> Cc: Ryder Lee <ryder.lee@mediatek.com>
>> Cc: Lorenzo Bianconi <lorenzo@kernel.org>
>> Cc: Felix Fietkau <nbd@nbd.name>
>> Cc: linux-wireless@vger.kernel.org
>> Cc: Kalle Valo <kvalo@codeaurora.org>
> 
> 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.
-- 
~Randy

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

[Kalle Valo]

Randy Dunlap <rdunlap@infradead.org> writes:

> On 12/18/20 10:48 AM, Kalle Valo wrote:
>> Randy Dunlap <rdunlap@infradead.org> writes:
>> 
>>> 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@infradead.org>
>>> Cc: Shayne Chen <shayne.chen@mediatek.com>
>>> Cc: Ryder Lee <ryder.lee@mediatek.com>
>>> Cc: Lorenzo Bianconi <lorenzo@kernel.org>
>>> Cc: Felix Fietkau <nbd@nbd.name>
>>> Cc: linux-wireless@vger.kernel.org
>>> Cc: Kalle Valo <kvalo@codeaurora.org>
>> 
>> 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.

> Shall I resend it?

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

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

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

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

[Kalle Valo]

Randy Dunlap <rdunlap@infradead.org> wrote:

> 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@infradead.org>
> Cc: Shayne Chen <shayne.chen@mediatek.com>
> Cc: Ryder Lee <ryder.lee@mediatek.com>
> Cc: Lorenzo Bianconi <lorenzo@kernel.org>
> Cc: Felix Fietkau <nbd@nbd.name>
> Cc: linux-wireless@vger.kernel.org
> Cc: Kalle Valo <kvalo@codeaurora.org>

Patch applied to wireless-drivers.git, thanks.

0bd157fa2aaa mt76: mt7915: fix MESH ifdef block

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20201218173202.23159-1-rdunlap@infradead.org/

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