iwlwifi: mvm: write queue_sync_state only for sync

AviStern · Kalle Valo · commit 97cc16943f23 · 2020-11-10T20:45:34.000+02:00
We use mvm->queue_sync_state to wait for synchronous queue sync messages, but if an async one happens inbetween we shouldn't clear mvm->queue_sync_state after sending the async one, that can run concurrently (at least from the CPU POV) with another synchronous queue sync. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Fixes: 3c514bf ("iwlwifi: mvm: add a loose synchronization of the NSSN across Rx queues") Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/iwlwifi.20201107104557.51a3148f2c14.I0772171dbaec87433a11513e9586d98b5d920b5f@changeid
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -3127,6 +3127,9 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
 			goto out_unlock;
 		}
 
+		if (vif->type == NL80211_IFTYPE_STATION)
+			vif->bss_conf.he_support = sta->he_cap.has_he;
+
 		if (sta->tdls &&
 		    (vif->p2p ||
 		     iwl_mvm_tdls_sta_count(mvm, NULL) ==

Original file line number	Diff line number	Diff line change
`@@ -3127,6 +3127,9 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,`
`3127`	`3127`	`goto out_unlock;`
`3128`	`3128`	`}`
`3129`	`3129`
	`3130`	`+ if (vif->type == NL80211_IFTYPE_STATION)`
	`3131`	`+ vif->bss_conf.he_support = sta->he_cap.has_he;`
	`3132`	`+`
`3130`	`3133`	`if (sta->tdls &&`
`3131`	`3134`	`(vif->p2p \|\|`
`3132`	`3135`	`iwl_mvm_tdls_sta_count(mvm, NULL) ==`