mt76: mt7915: fix misplaced #ifdef
PATCH 1/1 mt76: mt7915: fix misplaced #ifdef
From: Arnd Bergmann <[email protected]>
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.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +3 -4
@@ -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)
Signature · 7 lines
2.29.2 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Arnd Bergmann <[email protected]> [2021-01-03 14:57:55]:
Hi,
just a small nitpick,
Quoted 9 lines
From: Arnd Bergmann <[email protected]>
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 '}' tokenReplace 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:
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
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Quoted 17 lines · Petr Štetiar
Arnd Bergmann <[email protected]> [2021-01-03 14:57:55]:
Hi,
just a small nitpick,
Quoted 10 lines
From: Arnd Bergmann <[email protected]>
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 '}' tokenReplace the #ifdef with an equivalent
IS_ENABLED()check.Fixes af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
Quoted 7 lines
I think, that the correct fixes tag is following:
Fixes 8aa2c6f4714e ("mt76: mt7915: support 32 station interfaces")I've used the
af901eb4ab80as well first in
https://github.com/openwrt/mt76/pull/490 but then looked at it once more and actually found the probably correct8aa2c6f4714e.
Ok, I'll change that during commit.
Felix, I'm planning to apply this to wireless-drivers and assigned this to me in patchwork.
Signature · 8 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
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 '}' tokenReplace the #ifdef with an equivalent
IS_ENABLED()check.Fixes af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")Signed-off-by Arnd Bergmann <[email protected]>
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.
Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
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 '}' tokenReplace the #ifdef with an equivalent
IS_ENABLED()check.Fixes af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")Signed-off-by Arnd Bergmann <[email protected]>
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.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches