Commit b54cf0f4 authored by Pagadala Yesu Anjaneyulu's avatar Pagadala Yesu Anjaneyulu Committed by Johannes Berg
Browse files

wifi: cfg80211/mac80211: Add fallback mechanism for INDOOR_SP connection 



Implement fallback to LPI mode when SP mode is not permitted
by regulatory constraints for INDOOR_SP connections.
Limit fallback mechanism to client mode.

Signed-off-by: default avatarPagadala Yesu Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20251110140806.8b43201a34ae.I37fc7bb5892eb9d044d619802e8f2095fde6b296@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e18efacc

include/net/cfg80211.h

+7 −2
Original line number Diff line number Diff line
@@ -10137,22 +10137,27 @@ static inline int cfg80211_color_change_notify(struct net_device *dev, 
/**

 * cfg80211_6ghz_power_type - determine AP regulatory power type

 * @control: control flags

 * @client_flags: &enum ieee80211_channel_flags for station mode to enable

 *	SP to LPI fallback, zero otherwise.

 *

 * Return: regulatory power type from &enum ieee80211_ap_reg_power

 */

static inline enum ieee80211_ap_reg_power

cfg80211_6ghz_power_type(u8 control)

cfg80211_6ghz_power_type(u8 control, u32 client_flags)

{

	switch (u8_get_bits(control, IEEE80211_HE_6GHZ_OPER_CTRL_REG_INFO)) {

	case IEEE80211_6GHZ_CTRL_REG_LPI_AP:

	case IEEE80211_6GHZ_CTRL_REG_INDOOR_LPI_AP:

		return IEEE80211_REG_LPI_AP;

	case IEEE80211_6GHZ_CTRL_REG_SP_AP:

	case IEEE80211_6GHZ_CTRL_REG_INDOOR_SP_AP:

	case IEEE80211_6GHZ_CTRL_REG_INDOOR_SP_AP_OLD:

		return IEEE80211_REG_SP_AP;

	case IEEE80211_6GHZ_CTRL_REG_VLP_AP:

		return IEEE80211_REG_VLP_AP;

	case IEEE80211_6GHZ_CTRL_REG_INDOOR_SP_AP:

		if (client_flags & IEEE80211_CHAN_NO_6GHZ_AFC_CLIENT)

			return IEEE80211_REG_LPI_AP;

		return IEEE80211_REG_SP_AP;

	default:

		return IEEE80211_REG_UNSET_AP;

	}

net/mac80211/mlme.c

+2 −1
Original line number Diff line number Diff line
@@ -6076,7 +6076,8 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, 
		he_6ghz_oper = ieee80211_he_6ghz_oper(elems->he_operation);

		if (he_6ghz_oper)

			link->conf->power_type =

				cfg80211_6ghz_power_type(he_6ghz_oper->control);

				cfg80211_6ghz_power_type(he_6ghz_oper->control,

							 cbss->channel->flags);

		else

			link_info(link,

				  "HE 6 GHz operation missing (on %d MHz), expect issues\n",

net/wireless/core.h

+2 −1
Original line number Diff line number Diff line
@@ -550,7 +550,8 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev, 
		    bool signal_valid, unsigned long ts);



enum ieee80211_ap_reg_power

cfg80211_get_6ghz_power_type(const u8 *elems, size_t elems_len);

cfg80211_get_6ghz_power_type(const u8 *elems, size_t elems_len,

			     u32 client_flags);



#ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS

#define CFG80211_DEV_WARN_ON(cond)	WARN_ON(cond)

net/wireless/nl80211.c

+2 −2
Original line number Diff line number Diff line
@@ -6748,7 +6748,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) 
	beacon_check.relax = true;

	beacon_check.reg_power =

		cfg80211_get_6ghz_power_type(params->beacon.tail,

					     params->beacon.tail_len);

					     params->beacon.tail_len, 0);

	if (!cfg80211_reg_check_beaconing(&rdev->wiphy, &params->chandef,

					  &beacon_check)) {

		err = -EINVAL;
@@ -6927,7 +6927,7 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info) 
	beacon_check.relax = true;

	beacon_check.reg_power =

		cfg80211_get_6ghz_power_type(params->beacon.tail,

					     params->beacon.tail_len);

					     params->beacon.tail_len, 0);

	if (!cfg80211_reg_check_beaconing(&rdev->wiphy,

					  &wdev->links[link_id].ap.chandef,

					  &beacon_check)) {

net/wireless/scan.c

+4 −3
Original line number Diff line number Diff line
@@ -2212,7 +2212,8 @@ struct cfg80211_inform_single_bss_data { 
};



enum ieee80211_ap_reg_power

cfg80211_get_6ghz_power_type(const u8 *elems, size_t elems_len)

cfg80211_get_6ghz_power_type(const u8 *elems, size_t elems_len,

			     u32 client_flags)

{

	const struct ieee80211_he_6ghz_oper *he_6ghz_oper;

	struct ieee80211_he_operation *he_oper;
@@ -2230,13 +2231,13 @@ cfg80211_get_6ghz_power_type(const u8 *elems, size_t elems_len) 
	if (!he_6ghz_oper)

		return IEEE80211_REG_UNSET_AP;



	return cfg80211_6ghz_power_type(he_6ghz_oper->control);

	return cfg80211_6ghz_power_type(he_6ghz_oper->control, client_flags);

}



static bool cfg80211_6ghz_power_type_valid(const u8 *elems, size_t elems_len,

					   const u32 flags)

{

	switch (cfg80211_get_6ghz_power_type(elems, elems_len)) {

	switch (cfg80211_get_6ghz_power_type(elems, elems_len, flags)) {

	case IEEE80211_REG_LPI_AP:

		return true;

	case IEEE80211_REG_SP_AP: