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

Commit b0d7aa59 authored by Jonathan Doron's avatar Jonathan Doron Committed by Johannes Berg
Browse files

cfg80211: allow wiphy specific regdomain management 



Add a new regulatory flag that allows a driver to manage regdomain
changes/updates for its own wiphy.
A self-managed wiphys only employs regulatory information obtained from
the FW and driver and does not use other cfg80211 sources like
beacon-hints, country-code IEs and hints from other devices on the same
system. Conversely, a self-managed wiphy does not share its regulatory
hints with other devices in the system. If a system contains several
devices, one or more of which are self-managed, there might be
contradictory regulatory settings between them. Usage of flag is
generally discouraged. Only use it if the FW/driver is incompatible
with non-locally originated hints.

A new API lets the driver send a complete regdomain, to be applied on
its wiphy only.

After a wiphy-specific regdomain change takes place, usermode will get
a new type of change notification. The regulatory core also takes care
enforce regulatory restrictions, in case some interfaces are on
forbidden channels.

Signed-off-by: default avatarJonathan Doron <jonathanx.doron@intel.com>
Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Reviewed-by: default avatarLuis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ad30ca2c

include/net/cfg80211.h

+14 −0
Original line number Diff line number Diff line
@@ -3807,6 +3807,20 @@ const u8 *cfg80211_find_vendor_ie(unsigned int oui, u8 oui_type, 
 */

int regulatory_hint(struct wiphy *wiphy, const char *alpha2);



/**

 * regulatory_set_wiphy_regd - set regdom info for self managed drivers

 * @wiphy: the wireless device we want to process the regulatory domain on

 * @rd: the regulatory domain informatoin to use for this wiphy

 *

 * Set the regulatory domain information for self-managed wiphys, only they

 * may use this function. See %REGULATORY_WIPHY_SELF_MANAGED for more

 * information.

 *

 * Return: 0 on success. -EINVAL, -EPERM

 */

int regulatory_set_wiphy_regd(struct wiphy *wiphy,

			      struct ieee80211_regdomain *rd);



/**

 * wiphy_apply_custom_regulatory - apply a custom driver regulatory domain

 * @wiphy: the wireless device we want to process the regulatory domain on

include/net/regulatory.h

+19 −0
Original line number Diff line number Diff line
@@ -147,6 +147,24 @@ struct regulatory_request { 
 *	NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO,

 *	NL80211_IFTYPE_P2P_DEVICE. The flag will be set by default if a device

 *	includes any modes unsupported for enforcement checking.

 * @REGULATORY_WIPHY_SELF_MANAGED: for devices that employ wiphy-specific

 *	regdom management. These devices will ignore all regdom changes not

 *	originating from their own wiphy.

 *	A self-managed wiphys only employs regulatory information obtained from

 *	the FW and driver and does not use other cfg80211 sources like

 *	beacon-hints, country-code IEs and hints from other devices on the same

 *	system. Conversely, a self-managed wiphy does not share its regulatory

 *	hints with other devices in the system. If a system contains several

 *	devices, one or more of which are self-managed, there might be

 *	contradictory regulatory settings between them. Usage of flag is

 *	generally discouraged. Only use it if the FW/driver is incompatible

 *	with non-locally originated hints.

 *	This flag is incompatible with the flags: %REGULATORY_CUSTOM_REG,

 *	%REGULATORY_STRICT_REG, %REGULATORY_COUNTRY_IE_FOLLOW_POWER,

 *	%REGULATORY_COUNTRY_IE_IGNORE and %REGULATORY_DISABLE_BEACON_HINTS.

 *	Mixing any of the above flags with this flag will result in a failure

 *	to register the wiphy. This flag implies

 *	%REGULATORY_DISABLE_BEACON_HINTS and %REGULATORY_COUNTRY_IE_IGNORE.

 */

enum ieee80211_regulatory_flags {

	REGULATORY_CUSTOM_REG			= BIT(0),
@@ -156,6 +174,7 @@ enum ieee80211_regulatory_flags { 
	REGULATORY_COUNTRY_IE_IGNORE		= BIT(4),

	REGULATORY_ENABLE_RELAX_NO_IR           = BIT(5),

	REGULATORY_IGNORE_STALE_KICKOFF         = BIT(6),

	REGULATORY_WIPHY_SELF_MANAGED		= BIT(7),

};



struct ieee80211_freq_range {

include/uapi/linux/nl80211.h

+6 −0
Original line number Diff line number Diff line
@@ -782,6 +782,10 @@ 
 *	peer given by %NL80211_ATTR_MAC. Both peers must be on the base channel

 *	when this command completes.

 *

 * @NL80211_CMD_WIPHY_REG_CHANGE: Similar to %NL80211_CMD_REG_CHANGE, but used

 *	as an event to indicate changes for devices with wiphy-specific regdom

 *	management.

 *

 * @NL80211_CMD_MAX: highest used command number

 * @__NL80211_CMD_AFTER_LAST: internal use

 */
@@ -966,6 +970,8 @@ enum nl80211_commands { 
	NL80211_CMD_TDLS_CHANNEL_SWITCH,

	NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH,



	NL80211_CMD_WIPHY_REG_CHANGE,



	/* add new commands above here */



	/* used to define NL80211_CMD_MAX below */

net/wireless/core.c

+8 −0
Original line number Diff line number Diff line
@@ -561,6 +561,14 @@ int wiphy_register(struct wiphy *wiphy) 
				       BIT(NL80211_IFTYPE_MONITOR)))

		wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;



	if (WARN_ON((wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) &&

		    (wiphy->regulatory_flags &

					(REGULATORY_CUSTOM_REG |

					 REGULATORY_STRICT_REG |

					 REGULATORY_COUNTRY_IE_FOLLOW_POWER |

					 REGULATORY_COUNTRY_IE_IGNORE))))

		return -EINVAL;



	if (WARN_ON(wiphy->coalesce &&

		    (!wiphy->coalesce->n_rules ||

		     !wiphy->coalesce->n_patterns) &&

net/wireless/core.h

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,13 @@ struct cfg80211_registered_device { 
	 * the country on the country IE changed. */

	char country_ie_alpha2[2];



	/*

	 * the driver requests the regulatory core to set this regulatory

	 * domain as the wiphy's. Only used for %REGULATORY_WIPHY_SELF_MANAGED

	 * devices using the regulatory_set_wiphy_regd() API

	 */

	const struct ieee80211_regdomain *requested_regd;



	/* If a Country IE has been received this tells us the environment

	 * which its telling us its in. This defaults to ENVIRON_ANY */

	enum environment_cap env;