summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-02-19 11:14:27 +0200
committeriwlwifi publisher <>2024-04-17 12:52:27 +0000
commitf3d0c0a0545d4725b4dd41664f2ecb388983210d (patch)
treeec3288ddf698a04368ad6277c056546aad3cbfce
parentc1d95050c7aea32bb0e954902c127a13914181bf (diff)
downloadbackport-iwlwifi-f3d0c0a0545d4725b4dd41664f2ecb388983210d.tar.gz
[BUGFIX] wifi: mac80211: remove bss from ieee80211_link_data_managed
ieee80211_link_data_managed::bss moved to iee80211_bss_conf, but wasn't removed from ieee80211_link_data_managed. Remove it. In addition, document that bss contains data which is not necessarily authenticated, so drivers will know to be carefull using it. type=bugfix ticket=none fixes=I285153f48303ef320132e350d8c9452900df7fd7 Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: Iccdc79606ad21e5ccd4eaa639ffb874f8b31d738 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/95149 automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Johannes Berg <johannes.berg@intel.com> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> x-iwlwifi-stack-dev: 910af122226055a3bce356661be5daeedc73e255
-rw-r--r--include/net/mac80211.h4
-rw-r--r--net/mac80211/ieee80211_i.h2
-rw-r--r--versions2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index af9143a1fa..b3c9829dda 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -558,7 +558,9 @@ struct ieee80211_fils_discovery {
*
* @vif: reference to owning VIF
* @bss: the cfg80211 bss descriptor. Valid only for a station, and only
- * when associated.
+ * when associated. Note: This contains information which is not
+ * necessarily authenticated. For example, information coming from probe
+ * responses.
* @addr: (link) address used locally
* @link_id: link ID, or 0 for non-MLO
* @htc_trig_based_pkt_ext: default PE in 4us units, if BSS supports HE
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 29a64f5931..4a818ca4e4 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1010,8 +1010,6 @@ struct ieee80211_link_data_managed {
int mu_edca_last_param_set;
u8 bss_param_ch_cnt;
-
- struct cfg80211_bss *bss;
};
struct ieee80211_link_data_ap {
diff --git a/versions b/versions
index 014a01c81c..14cfe00c36 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:11913:53524793"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11914:910af122"