From: Dimitri John Ledkov dimitri.ledkov@canonical.com
stable inclusion from stable-v5.10.121 commit 22741dd048ef6a96610868c3de4aaf777e4e5339 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
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.c... Signed-off-by: Johannes Berg johannes.berg@intel.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com Acked-by: Xie XiuQi xiexiuqi@huawei.com --- net/wireless/reg.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 6b3386e1d93a..fd848609e656 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -787,6 +787,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; @@ -1058,6 +1060,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();