]> www.infradead.org Git - users/hch/misc.git/commitdiff
wifi: iwlwifi: mld: rename iwl_mld_set_key_rx_seq
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>
Thu, 21 Aug 2025 17:47:25 +0000 (20:47 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Tue, 26 Aug 2025 15:39:45 +0000 (18:39 +0300)
This function should only be used for group keys. For pairwise keys we
have iwl_mld_update_ptk_rx_seq. Make that clear from the name.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250821204455.ebf93a07905a.I8380b5cf9f6095b3a0b35fe4b7d56c544b921600@changeid
drivers/net/wireless/intel/iwlwifi/mld/d3.c

index db0c83a425faaab1282fd34a6ccfc0786f3fba36..b27b874b3e84c3d5a5dd6c315988df7c02aa1b4f 100644 (file)
@@ -679,8 +679,8 @@ iwl_mld_set_key_rx_seq_tids(struct ieee80211_key_conf *key,
 }
 
 static void
-iwl_mld_set_key_rx_seq(struct ieee80211_key_conf *key,
-                      struct iwl_mld_mcast_key_data *key_data)
+iwl_mld_update_mcast_rx_seq(struct ieee80211_key_conf *key,
+                           struct iwl_mld_mcast_key_data *key_data)
 {
        switch (key->cipher) {
        case WLAN_CIPHER_SUITE_CCMP:
@@ -768,7 +768,7 @@ iwl_mld_resume_keys_iter(struct ieee80211_hw *hw,
                }
 
                status_idx = key->keyidx == wowlan_status->gtk[1].id;
-               iwl_mld_set_key_rx_seq(key, &wowlan_status->gtk[status_idx]);
+               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:
@@ -776,11 +776,13 @@ iwl_mld_resume_keys_iter(struct ieee80211_hw *hw,
        case WLAN_CIPHER_SUITE_AES_CMAC:
                if (key->keyidx == 4 || key->keyidx == 5) {
                        if (key->keyidx == wowlan_status->igtk.id)
-                               iwl_mld_set_key_rx_seq(key, &wowlan_status->igtk);
+                               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;
-                       iwl_mld_set_key_rx_seq(key, &wowlan_status->bigtk[status_idx]);
+                       iwl_mld_update_mcast_rx_seq(key,
+                                                   &wowlan_status->bigtk[status_idx]);
                }
                break;
        default:
@@ -807,7 +809,7 @@ iwl_mld_add_mcast_rekey(struct ieee80211_vif *vif,
        if (IS_ERR(key_config))
                return;
 
-       iwl_mld_set_key_rx_seq(key_config, key_data);
+       iwl_mld_update_mcast_rx_seq(key_config, key_data);
 
        /* The FW holds only one igtk so we keep track of the valid one */
        if (key_config->keyidx == 4 || key_config->keyidx == 5) {