Commit 6c07b73e authored by Johannes Berg's avatar Johannes Berg

wifi: iwlwifi: mvm: skip MEI update for MLO

For now, if using MLO, skip the MEI update. It probably
needs new API for multiple channels.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230329100039.aeaa746b14e7.I42b084f3cdc20bb52cf867700a3c2e1f5e7b4ecb@changeidSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6e1b5956
...@@ -3464,7 +3464,6 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm, ...@@ -3464,7 +3464,6 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm,
struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
struct iwl_mei_conn_info conn_info = { struct iwl_mei_conn_info conn_info = {
.ssid_len = vif->cfg.ssid_len, .ssid_len = vif->cfg.ssid_len,
.channel = vif->bss_conf.chandef.chan->hw_value,
}; };
if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
...@@ -3473,6 +3472,12 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm, ...@@ -3473,6 +3472,12 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm,
if (!mvm->mei_registered) if (!mvm->mei_registered)
return; return;
/* FIXME: MEI needs to be updated for MLO */
if (!vif->bss_conf.chandef.chan)
return;
conn_info.channel = vif->bss_conf.chandef.chan->hw_value;
switch (mvm_sta->pairwise_cipher) { switch (mvm_sta->pairwise_cipher) {
case WLAN_CIPHER_SUITE_TKIP: case WLAN_CIPHER_SUITE_TKIP:
conn_info.pairwise_cipher = IWL_MEI_CIPHER_TKIP; conn_info.pairwise_cipher = IWL_MEI_CIPHER_TKIP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment