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

Commit 15c4e330 authored by Aviya Erenfeld's avatar Aviya Erenfeld Committed by Luca Coelho
Browse files

iwlmvm: tdls: Check TDLS channel switch support 



Some versions of the FW don't support channel switch in TDLS.
Add a condition that checks it.

Fixes: 307e4723 ("iwlwifi: mvm: configure TDLS peers to FW")
Signed-off-by: default avatarAviya Erenfeld <aviya.erenfeld@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent fabdcc2e

drivers/net/wireless/intel/iwlwifi/mvm/tdls.c

+11 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *

 * Copyright(c) 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(C) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -18,9 +19,7 @@ 
 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,

 * USA

 * along with this program.

 *

 * The full GNU General Public License is included in this distribution

 * in the file called COPYING.
@@ -33,6 +32,7 @@ 
 *

 * Copyright(c) 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(C) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -188,7 +188,13 @@ void iwl_mvm_recalc_tdls_state(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	if (tdls_sta_cnt == 1 && sta_added)

		iwl_mvm_power_update_mac(mvm);



	/* configure the FW with TDLS peer info */

	/* Configure the FW with TDLS peer info only if TDLS channel switch

	 * capability is set.

	 * TDLS config data is used currently only in TDLS channel switch code.

	 * Supposed to serve also TDLS buffer station which is not implemneted

	 * yet in FW*/

	if (fw_has_capa(&mvm->fw->ucode_capa,

			IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH))

		iwl_mvm_tdls_config(mvm, vif);



	/* when the last peer leaves, send a power update last */