Skip to content

Commit

Permalink
cfg80211: declare MODULE_FIRMWARE for regulatory.db
Browse files Browse the repository at this point in the history
commit 7bc7981 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>
  • Loading branch information
xnox authored and gregkh committed Jun 9, 2022
1 parent e55bcdd commit cf33ea3
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions net/wireless/reg.c
Expand Up @@ -807,6 +807,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;
Expand Down Expand Up @@ -1078,6 +1080,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();
Expand Down

0 comments on commit cf33ea3

Please sign in to comment.