summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-02-26 19:29:40 +0200
committeriwlwifi publisher <>2024-04-17 13:00:21 +0000
commitdd21c75e8c9f7f6d141bdfdfc4170f2beac42f54 (patch)
tree48c2845555b5a4eca03b07efc40df7727cf0a0e3
parentc66174206dc9c5f85e94f4c6b0b43580897d95d8 (diff)
downloadbackport-iwlwifi-dd21c75e8c9f7f6d141bdfdfc4170f2beac42f54.tar.gz
wifi: iwlwifi: mvm: save last link selection decision
This will be used in a later patch. type=feature ticket=none Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: Ifbbdcda74a64750eb92817733b118cbfb8b5ca85 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/96323 Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Johannes Berg <johannes.berg@intel.com> x-iwlwifi-stack-dev: de55df347d839ab1e2bf227a2ae7db51bc4bf540
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/link.c1
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c2
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mvm.h4
-rw-r--r--versions2
4 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index cc6c2305c5..e317749960 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -670,6 +670,7 @@ set_active:
new_active_links, primary_link);
ieee80211_set_active_links_async(vif, new_active_links);
mvmvif->primary_link = primary_link;
+ mvmvif->link_selection_res = new_active_links;
}
u8 iwl_mvm_get_primary_link(struct ieee80211_vif *vif)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 2839dd2831..25aeb723b8 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4099,6 +4099,7 @@ iwl_mvm_sta_state_assoc_to_authorized(struct iwl_mvm *mvm,
WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif));
mvmvif->authorized = 1;
+ mvmvif->link_selection_res = 0;
callbacks->mac_ctxt_changed(mvm, vif, false);
iwl_mvm_mei_host_associated(mvm, vif, mvm_sta);
@@ -4161,6 +4162,7 @@ iwl_mvm_sta_state_authorized_to_assoc(struct iwl_mvm *mvm,
* time.
*/
mvmvif->authorized = 0;
+ mvmvif->link_selection_res = 0;
/* disable beacon filtering */
iwl_mvm_disable_beacon_filter(mvm, vif);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index e6de51cd60..15c69f11ed 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -415,6 +415,9 @@ struct iwl_mvm_esr_exit {
* @esr_active: indicates eSR mode is active
* @esr_disable_reason: a bitmap of &enum iwl_mvm_esr_state
* @pm_enabled: indicates powersave is enabled
+ * @link_selection_res: bitmap of active links as it was decided in the last
+ * link selection. Valid only for a MLO vif after assoc. 0 if there wasn't
+ * any link selection yet.
* @primary_link: primary link in eSR. Valid only for an associated MLD vif,
* and in eSR mode. Valid only for a STA.
* @last_esr_exit: Details of the last exit from EMLSR.
@@ -514,6 +517,7 @@ struct iwl_mvm_vif {
u16 max_tx_op;
+ u16 link_selection_res;
u8 primary_link;
struct iwl_mvm_esr_exit last_esr_exit;
u8 exit_same_reason_count;
diff --git a/versions b/versions
index 2964f94f92..87dbd47b77 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:11951:55e8ad51"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11952:de55df34"