From ba3091c366dd5cde5e26f305b56377d2cf2f64b7 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 16 Nov 2015 17:18:40 -0800 Subject: [PATCH] qcacld-3.0: Increase MAX_CFG_INI_ITEMS to 1024 This is a qcacld-2.0 to qcacld-3.0 propagation. Increase the maximum config ini items from 512 to 1024. Change-Id: I5c4958d5c743f1e0b03a4f7b41e21ff9787ccd07 CRs-Fixed: 914336 --- core/hdd/inc/wlan_hdd_cfg.h | 2 +- core/hdd/src/wlan_hdd_cfg.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 90a14b49ea72..3777d8425bd4 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -53,7 +53,7 @@ #endif /* Number of items that can be configured */ -#define MAX_CFG_INI_ITEMS 512 +#define MAX_CFG_INI_ITEMS 1024 /* Defines for all of the things we read from the configuration (registry). */ diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 95bdb0722650..d3fd27f3f279 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3916,11 +3916,10 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, int i; int rv; - /* sanity test */ if (MAX_CFG_INI_ITEMS < cRegTableEntries) { - hddLog(LOGE, - "%s: MAX_CFG_INI_ITEMS too small, must be at least %ld", - __func__, cRegTableEntries); + hddLog(LOGE, FL("MAX_CFG_INI_ITEMS too small, must be at least %ld"), + cRegTableEntries); + WARN_ON(1); } for (idx = 0; idx < cRegTableEntries; idx++, pRegEntry++) {