Revert "[BUGFIX][NOUPSTREAM]iwlwifi: mvm: temporary WA to make a000 family use new beacon template"

This TLV is now updated in FW.
This reverts commit a05e42fc1a59981ca41e46b919245bcf88ccac6f.

type=main
ticket=none

Change-Id: I34a1f2939c6eaf622c48ea368c26d68f44483636
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/107993
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
x-iwlwifi-stack-dev: 5ecd2b479ca638ec2d4fac671ab0203178f2f9c5
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index ca8f7ba..2e89969 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1201,9 +1201,7 @@
 			 IWL_UCODE_TLV_CAPA_CSA_AND_TBTT_OFFLOAD))
 		return iwl_mvm_mac_ctxt_send_beacon_v6(mvm, vif, beacon);
 
-	/* TODO: remove first condition once FW merge new TLV */
-	if (iwl_mvm_has_new_tx_api(mvm) ||
-	    fw_has_api(&mvm->fw->ucode_capa,
+	if (fw_has_api(&mvm->fw->ucode_capa,
 		       IWL_UCODE_TLV_API_NEW_BEACON_TEMPLATE))
 		return iwl_mvm_mac_ctxt_send_beacon_v9(mvm, vif, beacon,
 						       link_conf);
diff --git a/versions b/versions
index e20d714..af27a64 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@
 BACKPORTED_KERNEL_VERSION="(see git)"
 BACKPORTED_KERNEL_NAME="iwlwifi"
 BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12200:c47954c7"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12201:5ecd2b47"