Merge 776e9911 on remote branch

Change-Id: I9cc50a634616683deea1c3a021c5a19c68fab426

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 CONFIG_FW_THERMAL_THROTTLE=y CONFIG_TARGET_11D_SCAN=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y CONFIG_TARGET_11D_SCAN=y CONFIG_REMOVE_PKT_LOG=n CONFIG_WDI_EVENT_ENABLE=y CONFIG_PKTLOG_LEGACY=y CONFIG_PKTLOG_HAS_SPECIFIC_DATA=y

sdmshrike_au/wlan.mk

@@ -51,4 +51,4 @@ endif
 # 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 CONFIG_TARGET_11D_SCAN=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FW_THERMAL_THROTTLE=y CONFIG_TARGET_11D_SCAN=y CONFIG_REMOVE_PKT_LOG=n CONFIG_WDI_EVENT_ENABLE=y CONFIG_PKTLOG_LEGACY=y CONFIG_PKTLOG_HAS_SPECIFIC_DATA=y

sm6150_au/wlan.mk

@@ -53,4 +53,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 CONFIG_FW_THERMAL_THROTTLE=y CONFIG_IPA_DISABLE_OVERRIDE=y CONFIG_TARGET_11D_SCAN=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 CONFIG_TARGET_11D_SCAN=y CONFIG_REMOVE_PKT_LOG=n CONFIG_WDI_EVENT_ENABLE=y CONFIG_PKTLOG_LEGACY=y CONFIG_PKTLOG_HAS_SPECIFIC_DATA=y