From patchwork Sun Feb 25 12:39:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 10240867 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B312603B4 for ; Sun, 25 Feb 2018 12:40:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09F5129CF0 for ; Sun, 25 Feb 2018 12:40:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDDF629CF2; Sun, 25 Feb 2018 12:40:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 831A829CF0 for ; Sun, 25 Feb 2018 12:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751782AbeBYMkC (ORCPT ); Sun, 25 Feb 2018 07:40:02 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:38791 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751653AbeBYMkB (ORCPT ); Sun, 25 Feb 2018 07:40:01 -0500 Received: by mail-wm0-f67.google.com with SMTP id z9so12270544wmb.3 for ; Sun, 25 Feb 2018 04:40:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=4YWRImWzwfbLmZcgaJ+jFMwBsvyHD7hRebSWuwwbUcg=; b=uht9hEDruxroUH6Aec84WO3Vz07OV+tN0yWUcLmHfwja45SFnhZgZ1CocCIPg+TxTO R1LY4iBdVgcHUcHUs8vZl9Hptk8IzWWIP5VrZ1qAqPaGVtllMnFg/o3BxexN25kY+xZW 7Up+WgHwRY7PSblBlv1+hf5wzsKQO/2NKoNVXDQPGukCi3Wt9SJIEWP+PqCJ2zkNHnzl 84eSv2d7Kddfz+nE8/VOS6LiZkZnwgOw1ilhBGmTLXxrrWj6q4Nf6v11gPVv+zAqngaC VfZLddl/aAVRHjdpRpeR6q8WXWjkYjCFnV9yKKPxN5XwkySV6Zj/bTwzfhCTkTV5kIFS ZLkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4YWRImWzwfbLmZcgaJ+jFMwBsvyHD7hRebSWuwwbUcg=; b=JeMQysHGFoR9XzunWWrPfP4Rpq/rYM2t8Otjio3TO34b6qtrCGXmBdCOffIjcbDNvC lUw6GU+sJdm6VWTU1NOzRUwXbSRBpPxUdybapGVNbymhtWalpf+Wb6O3xlHiXNXS6e4z oxeMAHb3bwwSrfZQzU6CfHPd33Tp63/ukioWo3kwvGt6BLNN8bAlsmh9zVO38b93HS7v DcYFJ0PIfcPin65DKOViVEVROVbwqLEsV8MRsIpMdiaPiIk4PlRJOAR+ZEZ7h9lQEauk FPw9xzPRiVvkbqGKX/TXq81Vxzk5kshtI7ekI5+p/iSqJTGMgg7iuvfKauKrparxXiTj i37w== X-Gm-Message-State: APf1xPCIPc2XLC5PRMth1Y+IN1XeyYRFGZLxZU36TrCkHAMcFp0W5B/3 kqqWktqg9Z3EaslB8kJU8d4= X-Google-Smtp-Source: AG47ELtmkY3G+tQ67i6vQAVQSx6crOnKlIthANOnnuknpEOjXCUfrjCygLRRlXCEwQqpLM2knOrnLA== X-Received: by 10.28.170.71 with SMTP id t68mr6614777wme.31.1519562400502; Sun, 25 Feb 2018 04:40:00 -0800 (PST) Received: from adeos.home (2a01cb00054978001a46adb371a118d7.ipv6.abo.wanadoo.fr. [2a01:cb00:549:7800:1a46:adb3:71a1:18d7]) by smtp.gmail.com with ESMTPSA id m55sm8054216wrf.38.2018.02.25.04.39.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Feb 2018 04:39:59 -0800 (PST) From: Romain Naour To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Romain Naour Subject: [PATCH] cfg80211: add missing dependency to CFG80211 suboptions Date: Sun, 25 Feb 2018 13:39:56 +0100 Message-Id: <20180225123956.32161-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP New options introduced by [1] are still enabled even if CFG80211 is disabled. .config: # CONFIG_CFG80211 is not set CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y # CONFIG_LIB80211 is not set When CFG80211_REQUIRE_SIGNED_REGDB is enabled, it select SYSTEM_DATA_VERIFICATION which select SYSTEM_TRUSTED_KEYRING that need extract-cert tool. extract-cert needs some openssl headers to be installed on the build machine. Instead of adding missing "depends on CFG80211", it easier to use a 'if' block around all options related to CFG80211. [1] 90a53e4432b12288316efaa5f308adafb8d304b0 Signed-off-by: Romain Naour --- net/wireless/Kconfig | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 1abcc4fc4df1..41722046b937 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -34,9 +34,10 @@ config CFG80211 When built as a module it will be called cfg80211. +if CFG80211 + config NL80211_TESTMODE bool "nl80211 testmode command" - depends on CFG80211 help The nl80211 testmode command helps implementing things like factory calibration or validation tools for wireless chips. @@ -51,7 +52,6 @@ config NL80211_TESTMODE config CFG80211_DEVELOPER_WARNINGS bool "enable developer warnings" - depends on CFG80211 default n help This option enables some additional warnings that help @@ -68,7 +68,7 @@ config CFG80211_DEVELOPER_WARNINGS config CFG80211_CERTIFICATION_ONUS bool "cfg80211 certification onus" - depends on CFG80211 && EXPERT + depends on EXPERT default n ---help--- You should disable this option unless you are both capable @@ -159,7 +159,6 @@ config CFG80211_REG_RELAX_NO_IR config CFG80211_DEFAULT_PS bool "enable powersave by default" - depends on CFG80211 default y help This option enables powersave mode by default. @@ -170,7 +169,6 @@ config CFG80211_DEFAULT_PS config CFG80211_DEBUGFS bool "cfg80211 DebugFS entries" - depends on CFG80211 depends on DEBUG_FS ---help--- You can enable this if you want debugfs entries for cfg80211. @@ -180,7 +178,6 @@ config CFG80211_DEBUGFS config CFG80211_CRDA_SUPPORT bool "support CRDA" if EXPERT default y - depends on CFG80211 help You should enable this option unless you know for sure you have no need for it, for example when using internal regdb (above) or the @@ -190,7 +187,6 @@ config CFG80211_CRDA_SUPPORT config CFG80211_WEXT bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT - depends on CFG80211 select WEXT_CORE default y if CFG80211_WEXT_EXPORT help @@ -199,11 +195,12 @@ config CFG80211_WEXT config CFG80211_WEXT_EXPORT bool - depends on CFG80211 help Drivers should select this option if they require cfg80211's wext compatibility symbols to be exported. +endif # CFG80211 + config LIB80211 tristate default n