From patchwork Fri Aug 10 10:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 10562617 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-2.web.codeaurora.org (Postfix) with ESMTP id B1222157B for ; Fri, 10 Aug 2018 10:59:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98D3F2B65F for ; Fri, 10 Aug 2018 10:59:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D36D2B67E; Fri, 10 Aug 2018 10:59:03 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 ABA6B2B65F for ; Fri, 10 Aug 2018 10:58:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727828AbeHJN2T (ORCPT ); Fri, 10 Aug 2018 09:28:19 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33696 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726963AbeHJN2T (ORCPT ); Fri, 10 Aug 2018 09:28:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0D4955A742; Fri, 10 Aug 2018 10:58:55 +0000 (UTC) Received: from localhost (unknown [10.43.2.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD76415562; Fri, 10 Aug 2018 10:58:54 +0000 (UTC) From: Stanislaw Gruszka To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Stanislaw Gruszka Subject: [PATCH] cfg80211: allow to build without CFG80211_REQUIRE_SIGNED_REGDB Date: Fri, 10 Aug 2018 12:55:47 +0200 Message-Id: <1533898547-14449-1-git-send-email-sgruszka@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 10 Aug 2018 10:58:55 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 10 Aug 2018 10:58:55 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'sgruszka@redhat.com' RCPT:'' 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 According to kconfig-language.txt conditional dependency should be expressed 2 times: bool "foo" if BAR default y if BAR Indeed, without additional if expression we always build with CFG80211_REQUIRE_SIGNED_REGDB even when CFG80211_CERTIFICATION_ONUS is not set. Fixes: 90a53e4432b1 ("cfg80211: implement regdb signature checking") Signed-off-by: Stanislaw Gruszka --- net/wireless/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 4172204..bd63b73 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -89,7 +89,7 @@ config CFG80211_CERTIFICATION_ONUS config CFG80211_REQUIRE_SIGNED_REGDB bool "require regdb signature" if CFG80211_CERTIFICATION_ONUS - default y + default y if CFG80211_CERTIFICATION_ONUS select SYSTEM_DATA_VERIFICATION help Require that in addition to the "regulatory.db" file a