lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfg80211: export reg_initiator_name()

Browse Source 
Drivers can now use this to parse the regulatory request and
be more verbose when needed.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Luis R. Rodriguez
2013-10-14 17:42:06 -07:00
committed by Johannes Berg
parent 446075d76b
commit 034c6d6e67
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/cfg80211.h
View File

@@ -3497,6 +3497,15 @@ void wiphy_apply_custom_regulatory(struct wiphy *wiphy,
const struct ieee80211_reg_rule *freq_reg_info(struct wiphy *wiphy, const struct ieee80211_reg_rule *freq_reg_info(struct wiphy *wiphy,
u32 center_freq); u32 center_freq);
/**
* reg_initiator_name - map regulatory request initiator enum to name
* @initiator: the regulatory request initiator
*
* You can use this to map the regulatory request initiator enum to a
* proper string representation.
*/
const char *reg_initiator_name(enum nl80211_reg_initiator initiator);
/* /*
* callbacks for asynchronous cfg80211 methods, notification * callbacks for asynchronous cfg80211 methods, notification
* functions and BSS handling helpers * functions and BSS handling helpers

26
net/wireless/reg.c
View File

@@ -768,24 +768,25 @@ const struct ieee80211_reg_rule *freq_reg_info(struct wiphy *wiphy,
} }
EXPORT_SYMBOL(freq_reg_info); EXPORT_SYMBOL(freq_reg_info);
#ifdef CONFIG_CFG80211_REG_DEBUG const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
static const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
{ {
switch (initiator) { switch (initiator) {
case NL80211_REGDOM_SET_BY_CORE: case NL80211_REGDOM_SET_BY_CORE:
return "Set by core"; return "core";
case NL80211_REGDOM_SET_BY_USER: case NL80211_REGDOM_SET_BY_USER:
return "Set by user"; return "user";
case NL80211_REGDOM_SET_BY_DRIVER: case NL80211_REGDOM_SET_BY_DRIVER:
return "Set by driver"; return "driver";
case NL80211_REGDOM_SET_BY_COUNTRY_IE: case NL80211_REGDOM_SET_BY_COUNTRY_IE:
return "Set by country IE"; return "country IE";
default: default:
WARN_ON(1); WARN_ON(1);
return "Set by bug"; return "bug";
} }
} }
EXPORT_SYMBOL(reg_initiator_name);
#ifdef CONFIG_CFG80211_REG_DEBUG
static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan, static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
const struct ieee80211_reg_rule *reg_rule) const struct ieee80211_reg_rule *reg_rule)
{ {
@@ -986,14 +987,17 @@ static bool ignore_reg_update(struct wiphy *wiphy,
struct regulatory_request *lr = get_last_request(); struct regulatory_request *lr = get_last_request();
if (!lr) { if (!lr) {
REG_DBG_PRINT("Ignoring regulatory request %s since last_request is not set\n", REG_DBG_PRINT("Ignoring regulatory request set by %s "
"since last_request is not set\n",
reg_initiator_name(initiator)); reg_initiator_name(initiator));
return true; return true;
} }
if (initiator == NL80211_REGDOM_SET_BY_CORE && if (initiator == NL80211_REGDOM_SET_BY_CORE &&
wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) { wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
REG_DBG_PRINT("Ignoring regulatory request %s since the driver uses its own custom regulatory domain\n", REG_DBG_PRINT("Ignoring regulatory request set by %s "
"since the driver uses its own custom "
"regulatory domain\n",
reg_initiator_name(initiator)); reg_initiator_name(initiator));
return true; return true;
} }
@@ -1005,7 +1009,9 @@ static bool ignore_reg_update(struct wiphy *wiphy,
if (wiphy_strict_alpha2_regd(wiphy) && !wiphy->regd && if (wiphy_strict_alpha2_regd(wiphy) && !wiphy->regd &&
initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
!is_world_regdom(lr->alpha2)) { !is_world_regdom(lr->alpha2)) {
REG_DBG_PRINT("Ignoring regulatory request %s since the driver requires its own regulatory domain to be set first\n", REG_DBG_PRINT("Ignoring regulatory request set by %s "
"since the driver requires its own regulatory "
"domain to be set first\n",
reg_initiator_name(initiator)); reg_initiator_name(initiator));
return true; return true;
} }