Commit 63ef576c authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: use correct sta ID for IGTK/BIGTK 



We don't (yet) send the IGTK down to the firmware, but when
we do it needs to be with the broadcast station ID, not the
multicast station ID. Same for the BIGTK, which we may send
already if firmware advertises it (but it doesn't yet.)

Fixes: a5de7de7 ("wifi: iwlwifi: mvm: enable TX beacon protection")
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/20230926110319.dbc653913353.I82e90c86010f0b9588a180d9835fd11f666f5196@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f05d1e04

drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c

+7 −2
Original line number Diff line number Diff line
@@ -24,10 +24,15 @@ static u32 iwl_mvm_get_sec_sta_mask(struct iwl_mvm *mvm, 
			return 0;

	}



	/* AP group keys are per link and should be on the mcast STA */

	/* AP group keys are per link and should be on the mcast/bcast STA */

	if (vif->type == NL80211_IFTYPE_AP &&

	    !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE))

	    !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {

		/* IGTK/BIGTK to bcast STA */

		if (keyconf->keyidx >= 4)

			return BIT(link_info->bcast_sta.sta_id);

		/* GTK for data to mcast STA */

		return BIT(link_info->mcast_sta.sta_id);

	}



	/* for client mode use the AP STA also for group keys */

	if (!sta && vif->type == NL80211_IFTYPE_STATION)