Merge 5a566248 on remote branch

Change-Id: I473e4645adbdbab59f0a0e51b03c6eaf25fe4bf1

msmnile_au/wlan.mk

@@ -52,4 +52,4 @@ endif
 # (<wlan_chip> is from $TARGET_WLAN_CHIP).
 #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
 WLAN_CFG_OVERRIDE_qca6390 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y

sdm710/WCNSS_qcom_cfg.ini

@@ -442,6 +442,7 @@ maxMSDUsPerRxInd=8
 # 1 - enable  0 - disable(default)
 gEnableNanSupport=1
 genable_nan_datapath=1
+nan_separate_iface_support=0
 ################ NAN feature set end #####################
 
 adaptive_dwell_mode_enabled=1

sdmshrike_au/wlan.mk

@@ -45,3 +45,10 @@ else
 # Value-added AOSP: STA + SAP + P2P or NAN
 WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
 endif
+
+# Override WLAN configurations
+# Usage:
+# To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
+# (<wlan_chip> is from $TARGET_WLAN_CHIP).
+#   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FW_THERMAL_THROTTLE=y

sm6150_au/wlan.mk

@@ -47,17 +47,10 @@ else
 WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
 endif
 
-# Override WLAN configurations
-# # Usage:
-# # To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
-# # (<wlan_chip> is from $TARGET_WLAN_CHIP).
-# #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_IPA_OFFLOAD=y
-
 # Override WLAN configurations
 # Usage:
 # To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
 # (<wlan_chip> is from $TARGET_WLAN_CHIP).
 #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
 WLAN_CFG_OVERRIDE_qca6390 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y CONFIG_IPA_DISABLE_OVERRIDE=y