Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0229cdaf authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: delay enabling smart FIFO until after beacon RX 



If we have no beacon data before association, delay smart FIFO
enablement until after we have this data.

Not doing so can cause association failures in extremely silent
environments (usually only a shielded box/room) as beacon RX is
not sent to the host immediately, and then the association time
event ends without the host receiving any beacon even though it
was on the air - it's just stuck on the FIFO.

Cc: <stable@vger.kernel.org> [3.14]
Fixes: 1f3b0ff8 ("iwlwifi: mvm: Add Smart FIFO support")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 67b3bd4e

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+1 −0
Original line number Diff line number Diff line
@@ -1332,6 +1332,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
		 */

		iwl_mvm_remove_time_event(mvm, mvmvif,

					  &mvmvif->time_event_data);

		iwl_mvm_sf_update(mvm, vif, false);

		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, CMD_SYNC));

	} else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS |

			      BSS_CHANGED_QOS)) {

drivers/net/wireless/iwlwifi/mvm/sf.c

+2 −1
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif, 
				return -EINVAL;

			if (changed_vif->type != NL80211_IFTYPE_STATION) {

				new_state = SF_UNINIT;

			} else if (changed_vif->bss_conf.assoc) {

			} else if (changed_vif->bss_conf.assoc &&

				   changed_vif->bss_conf.dtim_period) {

				mvmvif = iwl_mvm_vif_from_mac80211(changed_vif);

				sta_id = mvmvif->ap_sta_id;

				new_state = SF_FULL_ON;