wlan :Increase the number of channel in channel avoidance support.
For CxM support for LTE-Carrier aggregation coexistence with wlan,
increase the number of channel in channel avoidance support from
4 to 15.
CRs-Fixed: 855340
Change-Id: I72e9b1a7eda79713af872e70e2cbef889dc235c7
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index df82845..2b49f15 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -880,7 +880,7 @@
#ifdef FEATURE_WLAN_CH_AVOID
-#define HDD_MAX_AVOID_FREQ_RANGES 4
+#define HDD_MAX_AVOID_FREQ_RANGES 15
typedef struct sHddAvoidFreqRange
{
u32 startFreq;
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index b691f71..8ad7d2e 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -4671,7 +4671,7 @@
#endif // FEATURE_WLAN_BATCH_SCAN
#ifdef FEATURE_WLAN_CH_AVOID
-#define SIR_CH_AVOID_MAX_RANGE 4
+#define SIR_CH_AVOID_MAX_RANGE 15
typedef struct sSirChAvoidFreqType
{
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index de38c88..0690f78 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -834,7 +834,7 @@
} WDI_FWStatsResults;
#ifdef FEATURE_WLAN_CH_AVOID
-#define WDI_CH_AVOID_MAX_RANGE 4
+#define WDI_CH_AVOID_MAX_RANGE 15
typedef struct
{
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index a4f2be4..0592a2a 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -30948,6 +30948,10 @@
pEventData->pEventData,
sizeof(tHalAvoidFreqRangeIndParams));
+ /* Avoid Over flow */
+ if (WLAN_HAL_MAX_AVOID_FREQ_RANGE < chAvoidIndicationParam.avoidCnt)
+ chAvoidIndicationParam.avoidCnt = WLAN_HAL_MAX_AVOID_FREQ_RANGE;
+
wdiInd.wdiIndicationType = WDI_CH_AVOID_IND;
wdiInd.wdiIndicationData.wdiChAvoidInd.avoidRangeCount =
chAvoidIndicationParam.avoidCnt;