From patchwork Fri Oct 13 12:04:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 115764 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp649181qgn; Fri, 13 Oct 2017 05:05:30 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAVvwSFEqog82ERsAMb25/9S5dRTW1TAl492HQ4FTm/h0EtMH8qI7nR4+uEzG3FPqSZZ6uZ X-Received: by 10.84.136.36 with SMTP id 33mr1251487plk.108.1507896330509; Fri, 13 Oct 2017 05:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507896330; cv=none; d=google.com; s=arc-20160816; b=TefEIkw33hZrQVhBG6vdwY/mhd6RN/hs7yU0iDjUfPvc09diqf77EIW0JkbNLOBrZg jIhYkR+1QhWwmyX4meIY+D9bWmY+Boxz8CNP5oX/KbsK5aabZsteeV8Ek2BjhditOsM7 R3vIq7GfQ+mcYGuWHGD1Myb1aOVzGDhvQKxQPPzTNikxGc4hGyC2gV0R7X1QvOTZLiG6 lzF7n62tARHemJAXf4I6U2VBFa3Su/zeHsDZ7g1Mej1Irvf81i/eW+0pHMsK62YvbzQb 6Sv/16TobXvCgG6FQlYl9smuxbXbQAawZ0qfBNma8dCeOgzHxLE9jNS8gFz/MUQTiZek qLYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=jCL21jU1zJFy6dwqle104v8WRVsB65tSEeqcNvWdxUc=; b=uN1nYGySpmTfXZKqCk1vff7+5lDl+nRtaK2wiK0xMPJ1eK+/HSWyAsZyPC4Go3RgS0 moLW6bvrq8Q1bluUWRJK7xoWXqODFikwrh/B4f+FJBfuNJUBnzdwAazfL/sh3zi3R/LL 7mVK4Xu+JM8f6YaQNLx6CdBGeGFnyf8ZXazZl686RC3ion3I2HBsLrm6m52WYrmIpBT/ S3j629q9m/Wpf8hzvlLwHsSXYruLscnFtiA0MvzpjxDECEbZVHeDCkXcpOc/En9oyIBy l/ClS0M8ziGwfOmfu6ZQYnbJgJz0NRFZHFESNKwoGiy2kMtuHMK8y1s6DAfCbCuMJgbn 1x+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g23si551056plj.334.2017.10.13.05.05.30; Fri, 13 Oct 2017 05:05:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758175AbdJMMFP (ORCPT + 27 others); Fri, 13 Oct 2017 08:05:15 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:60554 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758139AbdJMMFK (ORCPT ); Fri, 13 Oct 2017 08:05:10 -0400 Received: from wuerfel.lan ([46.223.139.202]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LyUBK-1d9LZm0UlS-015soI; Fri, 13 Oct 2017 14:05:04 +0200 From: Arnd Bergmann To: Johannes Berg Cc: Arnd Bergmann , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] cfg80211: fix CFG80211_EXTRA_REGDB_KEYDIR typo Date: Fri, 13 Oct 2017 14:04:31 +0200 Message-Id: <20171013120446.4079666-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171013120446.4079666-1-arnd@arndb.de> References: <20171013120446.4079666-1-arnd@arndb.de> X-Provags-ID: V03:K0:WopwXvX3VCdeu5cX/mWw2Nnq0pY/DiQPfhKD84BWtwiZK4JXJJX /PD/ipj85WPe0zxY7AKrlB5UbeW2hV7uCajr86jy/NbfGFuJ4jueg5gNQN18IL5MGjCgfB+ Cp6ys82SnPampEUqir9hHB2xNGAk2CUa3qYxUMdhJdTxpe/7TTA47uaScgFF3t2b41d8DNq 70qgOCrp9wTWltlwUf9mA== X-UI-Out-Filterresults: notjunk:1; V01:K0:8oCDer5guEU=:+GckVp9DlQFRtS/3QrX9bw sHZ8mZxWyP7LCSId1lbV2dLDNfua8j1EC8mnhYmvQz+rXZ+SZgfqI0EO5gid3BwvU5G0HwLtD s+qctXqQH1JETyIWiHD8kGQ93xegVZrFS64eLd37KXiN1qjVdB2yePpCqFzQg0J+VlOmZUNmr s0NfGmLMoAdkOUO52tUe1MmilFdxJPMhiD1Vv8KFX2HRUUeGpCkMNtxHhsfoLAfL4DFE9T19+ 6okkc6co7KnTgZjy3U6NmHX+a3G8ZEAojhL0YX4XQ2e33X6r+sLFcWDUgIN+MyjNIEy62OJtk JTY8nfypsxOP4DJ2yPYLFRc73pb/7m0TNG8ilIXKDXfYiB93ausYxnNZxJddiZvISHf3dAUav SAnOurv06ip2wgpsfxQ46qk9V8KNTw/mHyyiP9lRFI4qa+3oukDRJLQlU0FgUWd0IBERwaNkK 3DY84ef1B0GcMeoRoWlpoM1gyg2DBH2wbOZrm1saQQWyRgIVZIHPzfei+MdytHa2tFVWMiqB4 PEUV+C2hqYUYUFHstwPp4uV+evFZQoTr1FjgiSA0vpd0pZPacvTCW39MOPQj62h0b10pNhkTC 0vQLsVDX1TYIBJ0tdRhPaWh1e4E17Ehkmai59c1LIBUvpA0AQDFCdDSD7QgsGoQoLQMbuczYv fLxFGUUl+RBcXAjOBPP/jCxKQ8XqBo2NT2Rgy+8Bw+Uo5bDL8ye/SlTijeviIMr01OTg3/qtH mInizzfLzWZ+oxSA9M1IlBRkv7TrXugUOmGUOA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The missing CONFIG_ prefix means this macro is never defined, leading to a possible Kbuild warning: net/wireless/reg.c:666:20: error: 'load_keys_from_buffer' defined but not used [-Werror=unused-function] static void __init load_keys_from_buffer(const u8 *p, unsigned int buflen) When we use the correct symbol, the warning also goes away. Fixes: 90a53e4432b1 ("cfg80211: implement regdb signature checking") Signed-off-by: Arnd Bergmann --- net/wireless/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 58319c82ecb3..3871998059de 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -723,7 +723,7 @@ static int __init load_builtin_regdb_keys(void) #ifdef CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS load_keys_from_buffer(shipped_regdb_certs, shipped_regdb_certs_len); #endif -#ifdef CFG80211_EXTRA_REGDB_KEYDIR +#ifdef CONFIG_CFG80211_EXTRA_REGDB_KEYDIR if (CONFIG_CFG80211_EXTRA_REGDB_KEYDIR[0] != '\0') load_keys_from_buffer(extra_regdb_certs, extra_regdb_certs_len); #endif