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
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index ad711ea..820244b 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2172,6 +2172,18 @@
#define CFG_BTC_DYN_OPP_TX_QUEUE_THOLD_MAX ( 3 )
#define CFG_BTC_DYN_OPP_TX_QUEUE_THOLD_DEFAULT ( 1 )
+#ifdef WLAN_FEATURE_11W
+#define CFG_PMF_SA_QUERY_MAX_RETRIES_NAME "pmfSaQueryMaxRetries"
+#define CFG_PMF_SA_QUERY_MAX_RETRIES_DEFAULT ( 5 )
+#define CFG_PMF_SA_QUERY_MAX_RETRIES_MIN ( 0 )
+#define CFG_PMF_SA_QUERY_MAX_RETRIES_MAX ( 20 )
+
+#define CFG_PMF_SA_QUERY_RETRY_INTERVAL_NAME "pmfSaQueryRetryInterval"
+#define CFG_PMF_SA_QUERY_RETRY_INTERVAL_DEFAULT ( 200 )
+#define CFG_PMF_SA_QUERY_RETRY_INTERVAL_MIN ( 0 )
+#define CFG_PMF_SA_QUERY_RETRY_INTERVAL_MAX ( 2000 )
+#endif
+
/*---------------------------------------------------------------------------
Type declarations
-------------------------------------------------------------------------*/
@@ -2622,6 +2634,11 @@
v_U32_t cfgBtcCriticalHidnSniffBlkGuidance;
v_U32_t cfgBtcA2dpTxQueueThold;
v_U32_t cfgBtcOppTxQueueThold;
+
+#ifdef WLAN_FEATURE_11W
+ v_U32_t pmfSaQueryMaxRetries;
+ v_U32_t pmfSaQueryRetryInterval;
+#endif
} hdd_config_t;
/*---------------------------------------------------------------------------
Function declarations and documenation
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;
}
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index f78fc8d..10c14b3 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -1508,24 +1508,22 @@
}
#endif
-
#ifdef WLAN_FEATURE_11W
if( eSIR_MAC_TRY_AGAIN_LATER == statusCode )
{
- if ( wlan_cfgGetInt(pMac, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES,
- &maxRetries ) != eSIR_SUCCESS )
- limLog( pMac, LOGE, FL("Could not retrieve PMF SA "
- "Query maximum retries value") );
+ if ( wlan_cfgGetInt(pMac, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES,
+ &maxRetries ) != eSIR_SUCCESS )
+ limLog( pMac, LOGE,
+ FL("Could not retrieve PMF SA Query maximum retries value") );
+ else
+ if ( wlan_cfgGetInt(pMac, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL,
+ &retryInterval ) != eSIR_SUCCESS)
+ limLog( pMac, LOGE,
+ FL("Could not retrieve PMF SA Query timer interval value") );
else
- if ( wlan_cfgGetInt(pMac, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL,
- &retryInterval ) != eSIR_SUCCESS)
- limLog( pMac, LOGE, FL("Could not retrieve PMF SA "
- "Query timer interval value") );
- else
- PopulateDot11fTimeoutInterval(
- pMac, &frm.TimeoutInterval,
- SIR_MAC_TI_TYPE_ASSOC_COMEBACK,
- (maxRetries - pSta->pmfSaQueryRetryCount) * retryInterval );
+ PopulateDot11fTimeoutInterval(
+ pMac, &frm.TimeoutInterval, SIR_MAC_TI_TYPE_ASSOC_COMEBACK,
+ (maxRetries - pSta->pmfSaQueryRetryCount) * retryInterval );
}
#endif
} // End if on non-NULL 'pSta'.
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index e20170a..10f0a02 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -7945,7 +7945,6 @@
{
limLog(pMac, LOGE, FL("Session does not exist for given session ID %d"),
timerId.fields.sessionId);
- pSta->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS;
return;
}
if ((pSta = dphGetHashEntry(pMac, timerId.fields.peerIdx,