Revert "wifi: mac80211: parse the BSS Load element"

This reverts commit 395d18018c07f43a059d63ba5bf4413b0a179496.
We will eventually use that element from the BSS, so no need
to parse/store it in bss_conf.

type=cleanup
ticket=none

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Change-Id: Ie9eca36af19498c6dfe88012959c3d91ac0eecbb
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/95150
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
x-iwlwifi-stack-dev: e9b0b45cd4828b8b9766e883141db7fab4df594d

6 files changed, 1 insertions, 40 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index b71b7f4638..4e4e359caa 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1287,24 +1287,6 @@ struct ieee80211_ttlm_elem {
 	u8 optional[];
 } __packed;
 
-/**
- * struct ieee80211_bss_load_elem - BSS Load elemen
- *
- * Defined in section 9.4.2.26 in IEEE 802.11-REVme D4.1
- *
- * @sta_count: total number of STAs currently associated with the AP.
- * @channel_util: Percentage of time that the access point sensed the channel
- *	was busy. This value is in range [0, 255], the highest value means
- *	100% busy.
- * @avail_admission_capa: remaining amount of medium time used for admission
- *	control.
- */
-struct ieee80211_bss_load_elem {
-	__le16 sta_count;
-	u8 channel_util;
-	__le16 avail_addmission_capa;
-} __packed;
-
 struct ieee80211_mgmt {
 	__le16 frame_control;
 	__le16 duration;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index b3c9829dda..89c617fe04 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -675,11 +675,6 @@ struct ieee80211_fils_discovery {
  *	processed after it switches back to %NULL.
  * @color_change_active: marks whether a color change is ongoing.
  * @color_change_color: the bss color that will be used after the change.
- * @channel_util: Channel utilization as published by the AP in the
- *	WLAN_EID_QBSS_LOAD information element. An unsigned integer in the
- *	range [0,255], when 255 means the 100% busy. Valid only for a
- *	station, and only when associated. Will be -1 if AP didn't
- *	send the element.
  * @ht_ldpc: in AP mode, indicates interface has HT LDPC capability.
  * @vht_ldpc: in AP mode, indicates interface has VHT LDPC capability.
  * @he_ldpc: in AP mode, indicates interface has HE LDPC capability.
@@ -786,8 +781,6 @@ struct ieee80211_bss_conf {
 	bool color_change_active;
 	u8 color_change_color;
 
-	s16 channel_util;
-
 	bool ht_ldpc;
 	bool vht_ldpc;
 	bool he_ldpc;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 4a818ca4e4..4ef2178aa7 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1746,7 +1746,6 @@ struct ieee802_11_elems {
 	const struct ieee80211_multi_link_elem *ml_reconf;
 	const struct ieee80211_bandwidth_indication *bandwidth_indication;
 	const struct ieee80211_ttlm_elem *ttlm[IEEE80211_TTLM_MAX_CNT];
-	const struct ieee80211_bss_load_elem *bss_load;
 
 	/* length of them, respectively */
 	u8 ext_capab_len;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 4c22846289..b69acccefe 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3079,7 +3079,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 	/* other links will be destroyed */
 	sdata->deflink.conf->bss = NULL;
 	sdata->deflink.smps_mode = IEEE80211_SMPS_OFF;
-	sdata->deflink.conf->channel_util = -1;
 
 	netif_carrier_off(sdata->dev);
 
@@ -6352,9 +6351,6 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_link_data *link,
 		erp_valid = false;
 	}
 
-	bss_conf->channel_util =
-		elems->bss_load ? elems->bss_load->channel_util : -1;
-
 	if (!ieee80211_is_s1g_beacon(hdr->frame_control))
 		changed |= ieee80211_handle_bss_capability(link,
 				le16_to_cpu(mgmt->u.beacon.capab_info),
@@ -7442,7 +7438,6 @@ void ieee80211_mgd_setup_link(struct ieee80211_link_data *link)
 	link->u.mgd.p2p_noa_index = -1;
 	link->conf->bssid = link->u.mgd.bssid;
 	link->smps_mode = IEEE80211_SMPS_OFF;
-	link->conf->channel_util = -1;
 
 	wiphy_work_init(&link->u.mgd.request_smps_work,
 			ieee80211_request_smps_mgd_work);
diff --git a/net/mac80211/parse.c b/net/mac80211/parse.c
index b804587942..d39ffe04ba 100644
--- a/net/mac80211/parse.c
+++ b/net/mac80211/parse.c
@@ -236,7 +236,6 @@ _ieee802_11_parse_elems_full(struct ieee80211_elems_parse_params *params,
 		case WLAN_EID_CF_PARAMS:
 		case WLAN_EID_TIM:
 		case WLAN_EID_IBSS_PARAMS:
-		case WLAN_EID_QBSS_LOAD:
 		case WLAN_EID_CHALLENGE:
 		case WLAN_EID_RSN:
 		case WLAN_EID_ERP_INFO:
@@ -331,13 +330,6 @@ _ieee802_11_parse_elems_full(struct ieee80211_elems_parse_params *params,
 				elem_parse_failed =
 					IEEE80211_PARSE_ERR_BAD_ELEM_SIZE;
 			break;
-		case WLAN_EID_QBSS_LOAD:
-			if (elen == sizeof(struct ieee80211_bss_load_elem))
-				elems->bss_load = (void *)pos;
-			else
-				elem_parse_failed =
-					IEEE80211_PARSE_ERR_BAD_ELEM_SIZE;
-			break;
 		case WLAN_EID_VENDOR_SPECIFIC:
 			if (elen >= 4 && pos[0] == 0x00 && pos[1] == 0x50 &&
 			    pos[2] == 0xf2) {
diff --git a/versions b/versions
index 14cfe00c36..fba2d97838 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
 BACKPORTED_KERNEL_VERSION="(see git)"
 BACKPORTED_KERNEL_NAME="iwlwifi"
 BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11914:910af122"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11915:e9b0b45c"