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: 356150 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp14270178jai; Sun, 3 Jan 2021 06:00:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSaXph839b5m4T9ANW53DrMokN2K58c5qEMLPHAJEoHa9kZa2xi1ozyANr7i2JSm328qmL X-Received: by 2002:a17:906:2b50:: with SMTP id b16mr62029457ejg.255.1609682421628; Sun, 03 Jan 2021 06:00:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609682421; cv=none; d=google.com; s=arc-20160816; b=X731Hf9n5XAvDZgNhtpvhFvxLnJb46BqM2kisI12ZBRk3PEWtjDoikXry0x2q7Dct7 aFuQIQdXvsLBKu0TYSxcJXVfIfARN5OFAActdrpV8ySFovMEWQnzOTqW3PoAFbQhXa8H D7Kw7g1xm5q3sNIA6Q9Tu+IHdv9SyWwzFP1TBuQw08rXD3TYgNq8tKS2iur/dGyko7Qj 4a7iMrMyu8FbHSqWJroxHoOLd4ESdVG9PscgQ/MzWw9PhPScxR4G1sedlQpErrQEwka8 XrXjFBTpINSqI4275mfIfcUSewVsw1YBEPJvA3ldbTg0rAV6d5dQjLjfAdqXYM81vulY vKsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=2nt4bkicWIM+R4vLtkY5r4MIvM+NBtMOH8w1CVB5KXY=; b=y/HIVF3zCneFtVIpS9030jmKhkRwLG74gWkdRUxu8iQT3dE3LZtNVVNYNoAMnyk2kS JUkXmowmKJLedP4jtrpO+Ts/IpeKjWqN/RwbbAw7EbmQ67mapAu/kEforJ1j+ATYwZWx juinpZUr8/SaBaegfZ7kdNpss9HitDLp6/Ds7QA9l1BILqujLjY0Wsl6coffocQYpz/U e2mPrAcGWQbjxaM3v0qApvEywL771Z8axI1VoNgo0dETzNokL0nojU6y7YgM42Fah7bx cfWGqMO/LK6q7GaPIxTWRUgNOwdDg1rj9ifsmg9ltJ4IiurGshTcabkVCbXySElZc93l b5gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XILYV6zS; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nw24si27533319ejb.647.2021.01.03.06.00.21; Sun, 03 Jan 2021 06:00:21 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XILYV6zS; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727187AbhACN65 (ORCPT + 8 others); 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: netdev@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(-) -- 2.29.2 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)