cfg80211: Enable GO operation on additional channels (174e0cd2) · Commits · 戴 / test

include/net/cfg80211.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -4539,12 +4539,14 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy,
		* cfg80211_reg_can_beacon - check if beaconing is allowed
		* @wiphy: the wiphy
		* @chandef: the channel definition
		* @iftype: interface type
		*
		* Return: %true if there is no secondary channel or the secondary channel(s)
		* can be used for beaconing (i.e. is not a radar channel etc.)
		*/
		bool cfg80211_reg_can_beacon(struct wiphy *wiphy,
		struct cfg80211_chan_def *chandef);
		struct cfg80211_chan_def *chandef,
		enum nl80211_iftype iftype);

		/*
		* cfg80211_ch_switch_notify - update wdev channel and notify userspace

include/net/regulatory.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,11 @@ struct regulatory_request {
		* all country IE information processed by the regulatory core. This will
		* override %REGULATORY_COUNTRY_IE_FOLLOW_POWER as all country IEs will
		* be ignored.
		* @REGULATORY_ENABLE_RELAX_NO_IR: for devices that wish to allow the
		* NO_IR relaxation, which enables transmissions on channels on which
		* otherwise initiating radiation is not allowed. This will enable the
		* relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration
		* option
		*/
		enum ieee80211_regulatory_flags {
		REGULATORY_CUSTOM_REG = BIT(0),
		@@ -138,6 +143,7 @@ enum ieee80211_regulatory_flags {
		REGULATORY_DISABLE_BEACON_HINTS = BIT(2),
		REGULATORY_COUNTRY_IE_FOLLOW_POWER = BIT(3),
		REGULATORY_COUNTRY_IE_IGNORE = BIT(4),
		REGULATORY_ENABLE_RELAX_NO_IR = BIT(5),
		};

		struct ieee80211_freq_range {

net/mac80211/ibss.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -262,7 +262,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
		/* make a copy of the chandef, it could be modified below. */
		chandef = *req_chandef;
		chan = chandef.chan;
		if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {
		if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef,
		NL80211_IFTYPE_ADHOC)) {
		if (chandef.width == NL80211_CHAN_WIDTH_5 \|\|
		chandef.width == NL80211_CHAN_WIDTH_10 \|\|
		chandef.width == NL80211_CHAN_WIDTH_20_NOHT \|\|
		@@ -274,7 +275,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
		chandef.width = NL80211_CHAN_WIDTH_20;
		chandef.center_freq1 = chan->center_freq;
		/* check again for downgraded chandef */
		if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {
		if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef,
		NL80211_IFTYPE_ADHOC)) {
		sdata_info(sdata,
		"Failed to join IBSS, beacons forbidden\n");
		return;
		@@ -861,7 +863,8 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata,
		goto disconnect;
		}

		if (!cfg80211_reg_can_beacon(sdata->local->hw.wiphy, &params.chandef)) {
		if (!cfg80211_reg_can_beacon(sdata->local->hw.wiphy, &params.chandef,
		NL80211_IFTYPE_ADHOC)) {
		sdata_info(sdata,
		"IBSS %pM switches to unsupported channel (%d MHz, width:%d, CF1/2: %d/%d MHz), disconnecting\n",
		ifibss->bssid,

net/wireless/Kconfig

+24 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,30 @@ config CFG80211_REG_CELLULAR_HINTS
		feature if you have tested and validated this feature on your
		systems.

		config CFG80211_REG_RELAX_NO_IR
		bool "cfg80211 support for NO_IR relaxation"
		depends on CFG80211_CERTIFICATION_ONUS
		---help---
		This option enables support for relaxation of the NO_IR flag for
		situations that certain regulatory bodies have provided clarifications
		on how relaxation can occur. This feature has an inherent dependency on
		userspace features which must have been properly tested and as such is
		not enabled by default.

		A relaxation feature example is allowing the operation of a P2P group
		owner (GO) on channels marked with NO_IR if there is an additional BSS
		interface which associated to an AP which userspace assumes or confirms
		to be an authorized master, i.e., with radar detection support and DFS
		capabilities. However, note that in order to not create daisy chain
		scenarios, this relaxation is not allowed in cases that the BSS client
		is associated to P2P GO and in addition the P2P GO instantiated on
		a channel due to this relaxation should not allow connection from
		non P2P clients.

		The regulatory core will apply these relaxations only for drivers that
		support this feature by declaring the appropriate channel flags and
		capabilities in their registration flow.

		config CFG80211_DEFAULT_PS
		bool "enable powersave by default"
		depends on CFG80211

net/wireless/chan.c

+73 −3

Original line number	Diff line number	Diff line
		@@ -661,15 +661,85 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
		}
		EXPORT_SYMBOL(cfg80211_chandef_usable);

		/*
		* For GO only, check if the channel can be used under permissive conditions
		* mandated by the some regulatory bodies, i.e., the channel is marked with
		* IEEE80211_CHAN_GO_CONCURRENT and there is an additional station interface
		* associated to an AP on the same channel or on the same UNII band
		* (assuming that the AP is an authorized master).
		*/
		static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev,
		struct ieee80211_channel *chan)
		{
		struct wireless_dev *wdev_iter;
		struct wiphy *wiphy = wiphy_idx_to_wiphy(rdev->wiphy_idx);

		ASSERT_RTNL();

		if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) \|\|
		!(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR) \|\|
		!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT))
		return false;

		/*
		* Generally, it is possible to rely on another device/driver to allow
		* the GO concurrent relaxation, however, since the device can further
		* enforce the relaxation (by doing a similar verifications as this),
		* and thus fail the GO instantiation, consider only the interfaces of
		* the current registered device.
		*/
		list_for_each_entry(wdev_iter, &rdev->wdev_list, list) {
		struct ieee80211_channel *other_chan = NULL;
		int r1, r2;

		if (wdev_iter->iftype != NL80211_IFTYPE_STATION \|\|
		!netif_running(wdev_iter->netdev))
		continue;

		wdev_lock(wdev_iter);
		if (wdev_iter->current_bss)
		other_chan = wdev_iter->current_bss->pub.channel;
		wdev_unlock(wdev_iter);

		if (!other_chan)
		continue;

		if (chan == other_chan)
		return true;

		if (chan->band != IEEE80211_BAND_5GHZ)
		continue;

		r1 = cfg80211_get_unii(chan->center_freq);
		r2 = cfg80211_get_unii(other_chan->center_freq);

		if (r1 != -EINVAL && r1 == r2)
		return true;
		}

		return false;
		}

		bool cfg80211_reg_can_beacon(struct wiphy *wiphy,
		struct cfg80211_chan_def *chandef)
		struct cfg80211_chan_def *chandef,
		enum nl80211_iftype iftype)
		{
		struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
		bool res;
		u32 prohibited_flags = IEEE80211_CHAN_DISABLED \|
		IEEE80211_CHAN_NO_IR \|
		IEEE80211_CHAN_RADAR;

		trace_cfg80211_reg_can_beacon(wiphy, chandef);
		trace_cfg80211_reg_can_beacon(wiphy, chandef, iftype);

		/*
		* Under certain conditions suggested by the some regulatory bodies
		* a GO can operate on channels marked with IEEE80211_NO_IR
		* so set this flag only if such relaxations are not enabled and
		* the conditions are not met.
		*/
		if (iftype != NL80211_IFTYPE_P2P_GO \|\|
		!cfg80211_go_permissive_chan(rdev, chandef->chan))
		prohibited_flags \|= IEEE80211_CHAN_NO_IR;

		if (cfg80211_chandef_dfs_required(wiphy, chandef) > 0 &&
		cfg80211_chandef_dfs_available(wiphy, chandef)) {

Admin message