From 9d23242e6842b75720cdba914b451c4f78ce87e7 Mon Sep 17 00:00:00 2001
From: ngong <ngong@codeaurora.org>
Date: Mon, 1 Jun 2020 14:12:11 +0800
Subject: [PATCH] qcacld-3.0: Check gIPAConfig before setting ipa flag to fw

Currently if kernel enable CONFIG_IPA3, wlan driver will directly
send IPA enabling flag to firmware, not checking gIPAConfig.
It lead to IPA disabled in driver but enabled in fw, causing fw crash
for some target like Genoa.

Correct logic is to check gIPAConfig before configure firmware.

Change-Id: I6e85c6bf3831029826bf279237eac2cc3a1ff07f
CRs-Fixed: 2698953
---
 core/wma/src/wma_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 60f88db187..9a55738213 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -103,6 +103,7 @@
 #include "wlan_policy_mgr_i.h"
 #include "target_if_psoc_timer_tx_ops.h"
 #include <ftm_time_sync_ucfg_api.h>
+#include "wlan_ipa_ucfg_api.h"
 
 #ifdef DIRECT_BUF_RX_ENABLE
 #include <target_if_direct_buf_rx_api.h>
@@ -234,7 +235,7 @@ static void wma_set_ipa_disable_config(
 static void wma_set_ipa_disable_config(
 					target_resource_config *tgt_cfg)
 {
-	tgt_cfg->ipa_disable = false;
+	tgt_cfg->ipa_disable = ucfg_ipa_is_enabled() ? false : true;
 }
 #endif