Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03f27120 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

cfg80211: export reg_initiator_name() 



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

Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 53c5a099

include/net/cfg80211.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -3483,6 +3483,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

net/wireless/reg.c

+17 −10
Original line number Original line Diff line number Diff line
@@ -768,23 +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)
@@ -979,14 +981,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;

	}

	}
@@ -998,7 +1003,9 @@ static bool ignore_reg_update(struct wiphy *wiphy, 
	if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&

	if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !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;

	}

	}