github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 11:33:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: iwlwifi: mld: don't check the cipher on resume

Browse Source 
On resume, we are iterating all the keys in order to update the PN.
Currently we check the cipher of the key we are currently iterating on
to decide whether the key is PTK, GTK, IGTK or BIGTK.
But we can find the type of the key by the keyidx, and we anyway have to
check the keyidx, so just remove the cipher switch case and check only
the keyidx instead

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250826184046.8c4f9c30242c.Ie34c200f321aae60771476fa9907c333a8a99747@changeid
This commit is contained in:
Miri Korenblit 2025-08-26 18:54:50 +03:00
parent 433570ee39
commit da70749568
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/net/wireless/intel/iwlwifi/mld/d3.c
View File

@ -745,37 +745,32 @@ iwl_mld_resume_keys_iter(struct ieee80211_hw *hw,
struct iwl_mld_wowlan_status *wowlan_status = data->wowlan_status;
u8 status_idx;
switch (key->cipher) {
case WLAN_CIPHER_SUITE_CCMP:
case WLAN_CIPHER_SUITE_GCMP:
case WLAN_CIPHER_SUITE_GCMP_256:
case WLAN_CIPHER_SUITE_TKIP:
if (key->keyidx >= 0 && key->keyidx <= 3) {
/* PTK */
if (sta) {
iwl_mld_update_ptk_rx_seq(data->mld, wowlan_status,
sta, key,
key->cipher ==
WLAN_CIPHER_SUITE_TKIP);
return;
}
status_idx = key->keyidx == wowlan_status->gtk[1].id;
iwl_mld_update_mcast_rx_seq(key, &wowlan_status->gtk[status_idx]);
break;
case WLAN_CIPHER_SUITE_BIP_GMAC_128:
case WLAN_CIPHER_SUITE_BIP_GMAC_256:
case WLAN_CIPHER_SUITE_BIP_CMAC_256:
case WLAN_CIPHER_SUITE_AES_CMAC:
if (key->keyidx == 4 || key->keyidx == 5) {
if (key->keyidx == wowlan_status->igtk.id)
iwl_mld_update_mcast_rx_seq(key,
&wowlan_status->igtk);
}
if (key->keyidx == 6 || key->keyidx == 7) {
status_idx = key->keyidx == wowlan_status->bigtk[1].id;
/* GTK */
} else {
status_idx = key->keyidx == wowlan_status->gtk[1].id;
iwl_mld_update_mcast_rx_seq(key,
&wowlan_status->bigtk[status_idx]);
&wowlan_status->gtk[status_idx]);
}
break;
}
/* IGTK */
if (key->keyidx == 4 || key->keyidx == 5) {
if (key->keyidx == wowlan_status->igtk.id)
iwl_mld_update_mcast_rx_seq(key, &wowlan_status->igtk);
}
/* BIGTK */
if (key->keyidx == 6 || key->keyidx == 7) {
status_idx = key->keyidx == wowlan_status->bigtk[1].id;
iwl_mld_update_mcast_rx_seq(key,
&wowlan_status->bigtk[status_idx]);
}
}