wlan: Remove redundant ini parameter for DHCP debugging
Currently two ini parameters gEnableDhcpDebug and
gEnableDebugLog are used for DHCP debugging.
Changes are done to remove gEnableDhcpDebug ini parameter
and control the dhcp debugging using only one ini
parameter.i.e. gEnableDebugLog.
Change-Id: I203fe47efde152d01f350de7492e23f368805ad7
CRs-Fixed: 770283
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 732945a..61ffe5c 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2377,15 +2377,6 @@
#define CFG_MAX_UAPSD_INACT_INTVL_MAX (255)
#define CFG_MAX_UAPSD_INACT_INTVL_DEFAULT (10)
-/*
- * This will enable DHCP packet logging for debugging purpose
- * The log level is set as INFO.
- */
-#define CFG_DEBUG_DHCP "gEnableDhcpDebug"
-#define CFG_DEBUG_DHCP_DISABLE ( 0 )
-#define CFG_DEBUG_DHCP_ENABLE ( 1 )
-#define CFG_DEBUG_DHCP_DEFAULT ( CFG_DEBUG_DHCP_DISABLE )
-
#define CFG_BURST_MODE_BE_TXOP_VALUE "gBurstModeTXOPValue"
#define CFG_BURST_MODE_BE_TXOP_VALUE_MIN ( 0 )
#define CFG_BURST_MODE_BE_TXOP_VALUE_MAX ( 12288 )
@@ -2874,7 +2865,6 @@
v_U32_t uapsdConsecTxCntMeasWindow;
v_U32_t maxPsPollInWmmUapsdMode;
v_U32_t maxUapsdInactivityIntervals;
- v_U8_t enableDhcpDebug; /* Enable/Disable dhcp debug */
v_U32_t burstModeTXOPValue;
v_U8_t acsScanBandPreference;
v_U16_t acsBandSwitchThreshold;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index db5192c..e99a5e9 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3198,14 +3198,6 @@
CFG_MAX_UAPSD_INACT_INTVL_MIN,
CFG_MAX_UAPSD_INACT_INTVL_MAX ),
- REG_VARIABLE( CFG_DEBUG_DHCP, WLAN_PARAM_Integer,
- hdd_config_t, enableDhcpDebug,
- VAR_FLAGS_OPTIONAL |
- VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_DEBUG_DHCP_DEFAULT,
- CFG_DEBUG_DHCP_DISABLE,
- CFG_DEBUG_DHCP_ENABLE ),
-
REG_VARIABLE( CFG_BURST_MODE_BE_TXOP_VALUE, WLAN_PARAM_Integer,
hdd_config_t, burstModeTXOPValue,
VAR_FLAGS_OPTIONAL |
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 324702c..635fdf1 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -9493,11 +9493,11 @@
}
//TODO: To Remove enableDhcpDebug and use gEnableDebugLog for
//EAPOL and DHCP
- pHddCtx->cfg_ini->enableDhcpDebug = CFG_DEBUG_DHCP_ENABLE;
- pHddCtx->cfg_ini->gEnableDebugLog = VOS_PKT_PROTO_TYPE_EAPOL;
+ if (!pHddCtx->cfg_ini->gEnableDebugLog)
+ pHddCtx->cfg_ini->gEnableDebugLog =
+ VOS_PKT_PROTO_TYPE_EAPOL | VOS_PKT_PROTO_TYPE_DHCP;
}
#endif
-
hdd_register_mcast_bcast_filter(pHddCtx);
if (VOS_STA_SAP_MODE != hdd_get_conparam())
{
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 1ae874b..a5b02a6 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -397,7 +397,8 @@
VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_INFO,
"%s: Classified as ac %d up %d", __func__, ac, up);
- if ( ( NULL != pHddCtx ) && pHddCtx->cfg_ini->enableDhcpDebug )
+ if (( NULL != pHddCtx ) &&
+ (pHddCtx->cfg_ini->gEnableDebugLog & VOS_PKT_PROTO_TYPE_DHCP))
{
hdd_dump_dhcp_pkt(skb, TX_PATH);
}
@@ -1337,7 +1338,8 @@
}
}
- if (pHddCtx->cfg_ini->gEnableDebugLog)
+ if ((NULL != pHddCtx) &&
+ (pHddCtx->cfg_ini->gEnableDebugLog))
{
proto_type = vos_pkt_get_proto_type(skb,
pHddCtx->cfg_ini->gEnableDebugLog);
@@ -1635,7 +1637,8 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_INFO_LOW,
"%s: send one packet to kernel", __func__);
- if ( pHddCtx->cfg_ini->enableDhcpDebug )
+ if ((NULL != pHddCtx) &&
+ (pHddCtx->cfg_ini->gEnableDebugLog & VOS_PKT_PROTO_TYPE_DHCP))
{
hdd_dump_dhcp_pkt(skb, RX_PATH);
}
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index 0efb623..33ff895 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -883,7 +883,8 @@
spin_unlock(&pAdapter->wmm_tx_queue[ac].lock);
- if ( ( NULL != pHddCtx ) && pHddCtx->cfg_ini->enableDhcpDebug )
+ if (( NULL != pHddCtx ) &&
+ (pHddCtx->cfg_ini->gEnableDebugLog & VOS_PKT_PROTO_TYPE_DHCP))
{
hdd_dump_dhcp_pkt(skb, TX_PATH);
}
@@ -1659,7 +1660,8 @@
else
pPktMetaInfo->ucIsEapol = hdd_IsEAPOLPacket( pVosPacket ) ? 1 : 0;
- if (pHddCtx->cfg_ini->gEnableDebugLog)
+ if ((NULL != pHddCtx) &&
+ (pHddCtx->cfg_ini->gEnableDebugLog))
{
proto_type = vos_pkt_get_proto_type(skb,
pHddCtx->cfg_ini->gEnableDebugLog);
@@ -2042,7 +2044,8 @@
}
*/
#endif
- if ( pHddCtx->cfg_ini->enableDhcpDebug )
+ if (( NULL != pHddCtx ) &&
+ (pHddCtx->cfg_ini->gEnableDebugLog & VOS_PKT_PROTO_TYPE_DHCP))
{
hdd_dump_dhcp_pkt(skb, RX_PATH);
}