summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.ledkov@canonical.com>2022-04-14 13:50:03 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-09 10:23:26 +0200
commit9cf980092286af683e8c59fcd678032a2a51e605 (patch)
tree76c5607747bcb4aff7272e295f336550aff3fd06 /net/wireless
parent8e354518f576307658d79847a3ec94025e42983f (diff)
downloadlinux-stable-9cf980092286af683e8c59fcd678032a2a51e605.tar.gz
linux-stable-9cf980092286af683e8c59fcd678032a2a51e605.tar.bz2
linux-stable-9cf980092286af683e8c59fcd678032a2a51e605.zip
cfg80211: declare MODULE_FIRMWARE for regulatory.db
commit 7bc7981eeebe1b8e603ad2ffc5e84f4df76920dd upstream. Add MODULE_FIRMWARE declarations for regulatory.db and regulatory.db.p7s such that userspace tooling can discover and include these files. Cc: stable@vger.kernel.org Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> Link: https://lore.kernel.org/r/20220414125004.267819-1-dimitri.ledkov@canonical.com Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 795e86b371bb..54c13ea7d977 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -806,6 +806,8 @@ static int __init load_builtin_regdb_keys(void)
return 0;
}
+MODULE_FIRMWARE("regulatory.db.p7s");
+
static bool regdb_has_valid_signature(const u8 *data, unsigned int size)
{
const struct firmware *sig;
@@ -1077,6 +1079,8 @@ static void regdb_fw_cb(const struct firmware *fw, void *context)
release_firmware(fw);
}
+MODULE_FIRMWARE("regulatory.db");
+
static int query_regdb_file(const char *alpha2)
{
ASSERT_RTNL();