commit fadc8e3dd7ec8414dddff4fbe59483468f8b933c
author Chet Lanctot <clanctot@qca.qualcomm.com> Thu Apr 24 14:50:52 2014 -0700
committer Kiet Lam <c_kietl@qca.qualcomm.com> Fri May 02 17:43:59 2014 -0700
tree da4e6d3f9718c970cb7c954a7c36658726f02e0b
parent 25144bbd50531026d94ed916fd80bf09796a88ac

wlan: Fix Setting of SA Query Configuration Parameters

The values of the PMF SA query configuration parameters
"SA query max retries" and "SA query retry interval" cannot
be set in the driver configuration file.

This is now fixed by adding appropriate code to the driver to
read values for these items from the file and writing the values
to existing entries in the driver configuration subsystem.

Change-Id: I718d96cd6227b462d7dca171675571f77d3d1b0c
CRs-Fixed: 654902

CORE/HDD/src/wlan_hdd_cfg.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 750d0ad..f5342b3 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3015,6 +3015,22 @@
                 CFG_BTC_DYN_OPP_TX_QUEUE_THOLD_DEFAULT,
                 CFG_BTC_DYN_OPP_TX_QUEUE_THOLD_MIN,
                 CFG_BTC_DYN_OPP_TX_QUEUE_THOLD_MAX ),
+
+#ifdef WLAN_FEATURE_11W
+   REG_VARIABLE(CFG_PMF_SA_QUERY_MAX_RETRIES_NAME, WLAN_PARAM_Integer,
+                hdd_config_t, pmfSaQueryMaxRetries,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_PMF_SA_QUERY_MAX_RETRIES_DEFAULT,
+                CFG_PMF_SA_QUERY_MAX_RETRIES_MIN,
+                CFG_PMF_SA_QUERY_MAX_RETRIES_MAX ),
+
+   REG_VARIABLE(CFG_PMF_SA_QUERY_RETRY_INTERVAL_NAME, WLAN_PARAM_Integer,
+                hdd_config_t, pmfSaQueryRetryInterval,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_PMF_SA_QUERY_RETRY_INTERVAL_DEFAULT,
+                CFG_PMF_SA_QUERY_RETRY_INTERVAL_MIN,
+                CFG_PMF_SA_QUERY_RETRY_INTERVAL_MAX ),
+#endif
 };
 
 /*
@@ -4768,6 +4784,24 @@
                     "WNI_CFG_BTC_DYN_OPP_TX_QUEUE_THOLD to CCM");
    }
 
+#ifdef WLAN_FEATURE_11W
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES,
+                    pConfig->pmfSaQueryMaxRetries, NULL,
+                    eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
+   {
+      fStatus = FALSE;
+      hddLog(LOGE, "Could not pass on WNI_CFG_SA_QUERY_MAX_RETRIES to CCM");
+   }
+
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL,
+                    pConfig->pmfSaQueryRetryInterval, NULL,
+                    eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
+   {
+      fStatus = FALSE;
+      hddLog(LOGE, "Could not pass on WNI_CFG_SA_QUERY_RETRY_INTERVAL to CCM");
+   }
+#endif
+
    return fStatus;
 }