Commit 88230ef1 authored Oct 13, 2017 by Arnd Bergmann Committed by Johannes Berg Oct 13, 2017

cfg80211: fix CFG80211_EXTRA_REGDB_KEYDIR typo

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: 90a53e44 ("cfg80211: implement regdb signature checking")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 1188e2a9

net/wireless/reg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message