]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
cfg80211: fix CFG80211_EXTRA_REGDB_KEYDIR typo
authorArnd Bergmann <arnd@arndb.de>
Fri, 13 Oct 2017 12:04:31 +0000 (14:04 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 13 Oct 2017 12:08:42 +0000 (14:08 +0200)
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 <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/reg.c

index 58319c82ecb34f14743bbffaa464fcd7b77fe2d5..3871998059de7beb9a2bff9a5321a8eb81bfcff4 100644 (file)
@@ -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