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

Commit f697267f authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: teardown TDLS peers during chan-switch and AP DCM 



The DCM condition was not checked well for channel switch in both AP and
station scenarios. Teardown was also not done for AP/GO DCM. Add the
missing checks.

Reported-by: default avatarPeer, Ilan <ilan.peer@intel.com>
Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent ae0008c7

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

+30 −22
Original line number Diff line number Diff line
@@ -1406,6 +1406,28 @@ static inline int iwl_mvm_configure_bcast_filter(struct iwl_mvm *mvm, 
}

#endif



static void iwl_mvm_teardown_tdls_peers(struct iwl_mvm *mvm)

{

	struct ieee80211_sta *sta;

	struct iwl_mvm_sta *mvmsta;

	int i;



	lockdep_assert_held(&mvm->mutex);



	for (i = 0; i < IWL_MVM_STATION_COUNT; i++) {

		sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[i],

						lockdep_is_held(&mvm->mutex));

		if (!sta || IS_ERR(sta) || !sta->tdls)

			continue;



		mvmsta = iwl_mvm_sta_from_mac80211(sta);

		ieee80211_tdls_oper_request(mvmsta->vif, sta->addr,

				NL80211_TDLS_TEARDOWN,

				WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED,

				GFP_KERNEL);

	}

}



static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,

					     struct ieee80211_vif *vif,

					     struct ieee80211_bss_conf *bss_conf,
@@ -1600,6 +1622,10 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, 


	iwl_mvm_bt_coex_vif_change(mvm);



	/* we don't support TDLS during DCM */

	if (iwl_mvm_phy_ctx_count(mvm) > 1)

		iwl_mvm_teardown_tdls_peers(mvm);



	mutex_unlock(&mvm->mutex);

	return 0;
@@ -1947,28 +1973,6 @@ static void iwl_mvm_recalc_tdls_state(struct iwl_mvm *mvm, 
		iwl_mvm_power_update_mac(mvm);

}



static void iwl_mvm_teardown_tdls_peers(struct iwl_mvm *mvm)

{

	struct ieee80211_sta *sta;

	struct iwl_mvm_sta *mvmsta;

	int i;



	lockdep_assert_held(&mvm->mutex);



	for (i = 0; i < IWL_MVM_STATION_COUNT; i++) {

		sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[i],

						lockdep_is_held(&mvm->mutex));

		if (!sta || IS_ERR(sta) || !sta->tdls)

			continue;



		mvmsta = iwl_mvm_sta_from_mac80211(sta);

		ieee80211_tdls_oper_request(mvmsta->vif, sta->addr,

				NL80211_TDLS_TEARDOWN,

				WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED,

				GFP_KERNEL);

	}

}



static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 struct ieee80211_sta *sta,
@@ -2846,6 +2850,10 @@ static int iwl_mvm_switch_vif_chanctx(struct ieee80211_hw *hw, 
		goto out_remove;

	}



	/* we don't support TDLS during DCM - can be caused by channel switch */

	if (iwl_mvm_phy_ctx_count(mvm) > 1)

		iwl_mvm_teardown_tdls_peers(mvm);



	goto out;



out_remove: