From patchwork Sun Jan 3 13:57:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11995737 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9BA3C433E6 for ; Sun, 3 Jan 2021 13:59:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADE75208C7 for ; Sun, 3 Jan 2021 13:59:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727176AbhACN65 (ORCPT ); Sun, 3 Jan 2021 08:58:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:35316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726303AbhACN64 (ORCPT ); Sun, 3 Jan 2021 08:58:56 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7521B20782; Sun, 3 Jan 2021 13:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609682296; bh=GJ3TiDbcI7Vu/JRfRThabclQjLmoFf/NfkaYgzUh29A=; h=From:To:Cc:Subject:Date:From; b=XILYV6zSwLXgZzW2kxk7c5CgaTvvA9NqMcRtliWJ8emVmxcIHNTio8+2Cwqlmsr0x HGjeo8uMQYAHzy4Kf7I2GDRgwztbb1EudBf+qCLlEKR2GQwzSNzwENeB6BSefyLszR ImwG+2Y8EktwUuOUlc3p0C/6DUf5+M3BK9mD1b77oNviaUrBMqwXGOSrWzjIspIgU6 WYt79zuHJYKbzRJM7lvomLbg2L5gdejeC6J/w4TFboMNTJl+AFefMdC0Tt7ScuQtHV +wVxC9DcPHtEMVgwabrHeucIO/4TwD3I7XQvYyA7x5DjLGLB3y/DCkMLEUYdjj6QVA VdT2/fRnJbYyw== From: Arnd Bergmann 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@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] mt76: mt7915: fix misplaced #ifdef Date: Sun, 3 Jan 2021 14:57:55 +0100 Message-Id: <20210103135811.3749775-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Arnd Bergmann 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 --- 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)