wlan: Add ini param to control probe rsp offloads
In the current implementation, in softap, there is no way to control
probe response offloads from ini and no log for source mac address of
received probe request frames.
This change addresses the following:
(1) adds ini parameter "gSapProbeRespOffload",
when set to 0/1 - disables/enables offloads, by default enabled
(2) logs mac address of received probe req frames
Change-Id: I2b4599a337fd5e78f2d07566cd099c22419eb94c
CRs-Fixed: 1035205
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index ec9f969..63cdf9f 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2752,6 +2752,15 @@
#define CFG_SEND_MGMT_PKT_VIA_WQ5_MAX ( 1)
#define CFG_SEND_MGMT_PKT_VIA_WQ5_DEF ( 0 )
+/*
+ * gSapProbeRespOffload: when set in sap, offloads the
+ * probe response transmission to firmware
+ */
+#define CFG_SAP_PROBE_RESP_OFFLOAD_NAME "gSapProbeRespOffload"
+#define CFG_SAP_PROBE_RESP_OFFLOAD_MIN (0)
+#define CFG_SAP_PROBE_RESP_OFFLOAD_MAX (1)
+#define CFG_SAP_PROBE_RESP_OFFLOAD_DEFAULT (1)
+
/*---------------------------------------------------------------------------
Type declarations
@@ -3297,6 +3306,7 @@
uint32_t edca_bk_aifs;
uint32_t edca_be_aifs;
v_BOOL_t sendMgmtPktViaWQ5;
+ v_BOOL_t sap_probe_resp_offload;
} hdd_config_t;
/*---------------------------------------------------------------------------
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index c5aabef..a3c8b6d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3629,6 +3629,12 @@
CFG_SEND_MGMT_PKT_VIA_WQ5_MIN,
CFG_SEND_MGMT_PKT_VIA_WQ5_MAX ),
+ REG_VARIABLE(CFG_SAP_PROBE_RESP_OFFLOAD_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, sap_probe_resp_offload,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_SAP_PROBE_RESP_OFFLOAD_DEFAULT,
+ CFG_SAP_PROBE_RESP_OFFLOAD_MIN,
+ CFG_SAP_PROBE_RESP_OFFLOAD_MAX),
};
/*
@@ -4138,6 +4144,10 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
"Name = [gSendMgmtPktViaWQ5] Value = [%u] ",
pHddCtx->cfg_ini->sendMgmtPktViaWQ5);
+
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Name = [%s] Value = [%u] ", CFG_SAP_PROBE_RESP_OFFLOAD_NAME,
+ pHddCtx->cfg_ini->sap_probe_resp_offload);
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 8ae41c8..878984f 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -741,9 +741,12 @@
if ((fc.type == SIR_MAC_MGMT_FRAME) &&
(fc.subType != SIR_MAC_MGMT_BEACON))
{
- limLog(pMac, LOG1, FL("RX MGMT - Type %hu, SubType %hu, Seq.no %d"),
- fc.type, fc.subType,
- ((pHdr->seqControl.seqNumHi << 4) | (pHdr->seqControl.seqNumLo)));
+ limLog(pMac, LOG1, FL("RX MGMT - Type %hu, SubType %hu,"
+ "Seq.no %d, Source mac-addr "
+ MAC_ADDRESS_STR), fc.type, fc.subType,
+ ((pHdr->seqControl.seqNumHi << 4) |
+ (pHdr->seqControl.seqNumLo)),
+ MAC_ADDR_ARRAY(pHdr->sa));
}
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
if ( WDA_GET_ROAMCANDIDATEIND(pRxPacketInfo))
diff --git a/CORE/MAC/src/pe/sch/schApi.c b/CORE/MAC/src/pe/sch/schApi.c
index 45b4e1c..c9c8ef4 100644
--- a/CORE/MAC/src/pe/sch/schApi.c
+++ b/CORE/MAC/src/pe/sch/schApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -353,6 +353,7 @@
&& (pMac->sch.schObject.fBeaconChanged)
&& ((psessionEntry->proxyProbeRspEn)
|| (IS_FEATURE_SUPPORTED_BY_FW(WPS_PRBRSP_TMPL)))
+ && vos_is_probe_rsp_offload_enabled()
)
{
diff --git a/CORE/MAC/src/pe/sch/schBeaconGen.c b/CORE/MAC/src/pe/sch/schBeaconGen.c
index 8def5f3..12ca744 100644
--- a/CORE/MAC/src/pe/sch/schBeaconGen.c
+++ b/CORE/MAC/src/pe/sch/schBeaconGen.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -276,6 +276,7 @@
if((psessionEntry->limSystemRole == eLIM_AP_ROLE)
&& ((psessionEntry->proxyProbeRspEn)
|| (IS_FEATURE_SUPPORTED_BY_FW(WPS_PRBRSP_TMPL)))
+ && vos_is_probe_rsp_offload_enabled()
)
{
/* Initialize the default IE bitmap to zero */
@@ -420,6 +421,7 @@
if((psessionEntry->limSystemRole == eLIM_AP_ROLE)
&& ((psessionEntry->proxyProbeRspEn)
|| (IS_FEATURE_SUPPORTED_BY_FW(WPS_PRBRSP_TMPL)))
+ && vos_is_probe_rsp_offload_enabled()
)
{
/* Can be efficiently updated whenever new IE added in Probe response in future */
diff --git a/CORE/VOSS/inc/vos_api.h b/CORE/VOSS/inc/vos_api.h
index dadb57e..d659281 100644
--- a/CORE/VOSS/inc/vos_api.h
+++ b/CORE/VOSS/inc/vos_api.h
@@ -505,4 +505,7 @@
void vos_per_pkt_stats_to_user(void *perPktStat);
void vos_updatePktStatsInfo(void * pktStat);
bool vos_is_wlan_logging_enabled(void);
+
+v_BOOL_t vos_is_probe_rsp_offload_enabled(void);
+
#endif // if !defined __VOS_NVITEM_H
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index a97dcb3..5c76002 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -3519,3 +3519,40 @@
return true;
}
+
+/**---------------------------------------------------------------------------
+
+ \brief vos_is_probe_rsp_offload_enabled -
+
+ API to check if probe response offload feature is enabled from ini
+
+ \param - None
+
+ \return - 0: probe response offload is disabled
+ 1: probe response offload is enabled
+
+ --------------------------------------------------------------------------*/
+v_BOOL_t vos_is_probe_rsp_offload_enabled(void)
+{
+ hdd_context_t *pHddCtx = NULL;
+ v_CONTEXT_t pVosContext = NULL;
+
+ /* Get the Global VOSS Context */
+ pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
+ if (!pVosContext) {
+ hddLog(VOS_TRACE_LEVEL_FATAL,
+ "%s: Global VOS context is Null", __func__);
+ return FALSE;
+ }
+
+ /* Get the HDD context */
+ pHddCtx = (hdd_context_t *)vos_get_context(VOS_MODULE_ID_HDD,
+ pVosContext);
+ if (!pHddCtx) {
+ hddLog(VOS_TRACE_LEVEL_FATAL,
+ "%s: HDD context is Null", __func__);
+ return FALSE;
+ }
+
+ return pHddCtx->cfg_ini->sap_probe_resp_offload;
+}
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 703ac46..e0ce18f 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -25704,7 +25704,11 @@
phalConfigBSS->dualCTSProtection = pwdiConfigBSS->ucDualCTSProtection;
phalConfigBSS->ucMaxProbeRespRetryLimit = pwdiConfigBSS->ucMaxProbeRespRetryLimit;
phalConfigBSS->bHiddenSSIDEn = pwdiConfigBSS->bHiddenSSIDEn;
- phalConfigBSS->bProxyProbeRespEn = pwdiConfigBSS->bProxyProbeRespEn;
+
+ if (vos_is_probe_rsp_offload_enabled())
+ phalConfigBSS->bProxyProbeRespEn = 1;
+ else
+ phalConfigBSS->bProxyProbeRespEn = pwdiConfigBSS->bProxyProbeRespEn;
#ifdef WLAN_FEATURE_VOWIFI
phalConfigBSS->maxTxPower = pwdiConfigBSS->cMaxTxPower;