* [PATCH] mt76: mt7915: fix misplaced #ifdef
@ 2021-01-03 13:57 Arnd Bergmann
2021-01-06 13:58 ` Petr Štetiar
2021-01-14 16:54 ` Kalle Valo
0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2021-01-03 13:57 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Arnd Bergmann, Ryder Lee, Kalle Valo, David S. Miller,
Jakub Kicinski, Matthias Brugger, Shayne Chen, Yiwei Chung,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel
From: Arnd Bergmann <arnd@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@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mt76: mt7915: fix misplaced #ifdef
2021-01-03 13:57 [PATCH] mt76: mt7915: fix misplaced #ifdef Arnd Bergmann
@ 2021-01-06 13:58 ` Petr Štetiar
2021-01-14 10:44 ` Kalle Valo
2021-01-14 16:54 ` Kalle Valo
1 sibling, 1 reply; 4+ messages in thread
From: Petr Štetiar @ 2021-01-06 13:58 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Felix Fietkau, Lorenzo Bianconi, Arnd Bergmann, Ryder Lee,
Kalle Valo, David S. Miller, Jakub Kicinski, Matthias Brugger,
Shayne Chen, Yiwei Chung, linux-wireless, netdev,
linux-arm-kernel, linux-mediatek, linux-kernel
Arnd Bergmann <arnd@kernel.org> [2021-01-03 14:57:55]:
Hi,
just a small nitpick,
> From: Arnd Bergmann <arnd@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")
I think, that the correct fixes tag is following:
Fixes: 8aa2c6f4714e ("mt76: mt7915: support 32 station interfaces")
I've used the af901eb4ab80 as well first in
https://github.com/openwrt/mt76/pull/490 but then looked at it once more and
actually found the probably correct 8aa2c6f4714e.
Cheers,
Petr
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mt76: mt7915: fix misplaced #ifdef
2021-01-06 13:58 ` Petr Štetiar
@ 2021-01-14 10:44 ` Kalle Valo
0 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2021-01-14 10:44 UTC (permalink / raw)
To: Petr Štetiar
Cc: Arnd Bergmann, Felix Fietkau, Lorenzo Bianconi, Arnd Bergmann,
Ryder Lee, David S. Miller, Jakub Kicinski, Matthias Brugger,
Shayne Chen, Yiwei Chung, linux-wireless, netdev,
linux-arm-kernel, linux-mediatek, linux-kernel
Petr Štetiar <ynezz@true.cz> writes:
> Arnd Bergmann <arnd@kernel.org> [2021-01-03 14:57:55]:
>
> Hi,
>
> just a small nitpick,
>
>> From: Arnd Bergmann <arnd@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")
>
> I think, that the correct fixes tag is following:
>
> Fixes: 8aa2c6f4714e ("mt76: mt7915: support 32 station interfaces")
>
> I've used the af901eb4ab80 as well first in
> https://github.com/openwrt/mt76/pull/490 but then looked at it once more and
> actually found the probably correct 8aa2c6f4714e.
Ok, I'll change that during commit.
Felix, I'm planning to apply this to wireless-drivers and assigned this
to me in patchwork.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mt76: mt7915: fix misplaced #ifdef
2021-01-03 13:57 [PATCH] mt76: mt7915: fix misplaced #ifdef Arnd Bergmann
2021-01-06 13:58 ` Petr Štetiar
@ 2021-01-14 16:54 ` Kalle Valo
1 sibling, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2021-01-14 16:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Felix Fietkau, Lorenzo Bianconi, Arnd Bergmann, Ryder Lee,
David S. Miller, Jakub Kicinski, Matthias Brugger, Shayne Chen,
Yiwei Chung, linux-wireless, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel
Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@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@arndb.de>
This was already fixed by:
0bd157fa2aaa mt76: mt7915: fix MESH ifdef block
Recorded preimage for 'drivers/net/wireless/mediatek/mt76/mt7915/init.c'
error: Failed to merge in the changes.
Applying: mt76: mt7915: fix misplaced #ifdef
Using index info to reconstruct a base tree...
M drivers/net/wireless/mediatek/mt76/mt7915/init.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/mediatek/mt76/mt7915/init.c
CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7915/init.c
Patch failed at 0001 mt76: mt7915: fix misplaced #ifdef
The copy of the patch that failed is found in: .git/rebase-apply/patch
Patch set to Superseded.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210103135811.3749775-1-arnd@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-14 16:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-03 13:57 [PATCH] mt76: mt7915: fix misplaced #ifdef Arnd Bergmann
2021-01-06 13:58 ` Petr Štetiar
2021-01-14 10:44 ` Kalle Valo
2021-01-14 16:54 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).