diff options
| author | Benjamin Berg <benjamin.berg@intel.com> | 2026-09-21 14:40:53 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2026-09-28 11:13:39 +0200 |
| commit | 89665aeecd0f0c6b4ae620dfd4c67b99751f4cd1 (patch) | |
| tree | 724611b410a1ea1d321e7c0817b53add17fafa8e /drivers/net/wireless/intel/iwlwifi | |
| parent | 3191dfbf0779337292526bacb53ac442650099da (diff) | |
| download | linux-next-89665aeecd0f0c6b4ae620dfd4c67b99751f4cd1.tar.gz linux-next-89665aeecd0f0c6b4ae620dfd4c67b99751f4cd1.zip | |
wifi: mac80211: add cigtk parameter to ieee80211_gtk_rekey_add
The CIGTK keys use a key index of 0 or 1, which is not unique. As such,
a new parameter is needed to differentiate the key type. Add the
parameter to prepare for handling the CIGTK in the future.
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Link: https://patch.msgid.link/20260921144048.8bfea7df6b06.I3d046fbe7dfb3883471773f84e7a791b5b97000e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mld/d3.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/d3.c b/drivers/net/wireless/intel/iwlwifi/mld/d3.c index 55f9b809e764..6d8ede336d59 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/d3.c @@ -1138,7 +1138,8 @@ iwl_mld_add_mcast_rekey(struct ieee80211_vif *vif, return; key_config = ieee80211_gtk_rekey_add(vif, key_data->id, key_data->key, - sizeof(key_data->key), link_id); + sizeof(key_data->key), link_id, + false); if (IS_ERR(key_config)) return; @@ -1220,7 +1221,8 @@ static void iwl_mld_mlo_rekey(struct iwl_mld *mld, mlo_key->idx, link_id); key = ieee80211_gtk_rekey_add(vif, mlo_key->idx, mlo_key->key, - sizeof(mlo_key->key), link_id); + sizeof(mlo_key->key), link_id, + false); if (IS_ERR(key)) continue; diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c index 6b11fa32ea5c..bd52f2ebd3ba 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c @@ -1887,7 +1887,8 @@ static bool iwl_mvm_gtk_rekey(struct iwl_wowlan_status_data *status, key = ieee80211_gtk_rekey_add(vif, status->gtk[i].id, status->gtk[i].key, - sizeof(status->gtk[i].key), -1); + sizeof(status->gtk[i].key), -1, + false); if (IS_ERR(key)) { /* FW may send also the old keys */ if (PTR_ERR(key) == -EALREADY) @@ -1922,7 +1923,8 @@ iwl_mvm_d3_igtk_bigtk_rekey_add(struct iwl_wowlan_status_data *status, return true; key_config = ieee80211_gtk_rekey_add(vif, keyidx, key_data->key, - sizeof(key_data->key), -1); + sizeof(key_data->key), -1, + false); if (IS_ERR(key_config)) { /* FW may send also the old keys */ return PTR_ERR(key_config) == -EALREADY; |