diff options
| author | Mingcheng Zhu <mingchen@qca.qualcomm.com> | 2014-07-18 20:14:19 -0700 |
|---|---|---|
| committer | Pitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com> | 2014-07-22 11:16:41 +0530 |
| commit | edbc97bf3b37276f4c2bfe95d83512744048c8fd (patch) | |
| tree | fb386cea5578ebe12cfa4f02703c1af006e7fd9a | |
| parent | 2d264fa305d3405bca12e72f702359df5568fd7f (diff) | |
WLAN: Protect pktlog init/deinit
When epping is enabled there is no pktlog implemented in FW so
that no pktlog init/exit.
CRs-Fixed: 657692
Change-Id: Ifed74dae750740fe5bb2dd84fd3927d199256cb6
| -rw-r--r-- | CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c b/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c index 45767a0330b4..433247c7f809 100644 --- a/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c +++ b/CORE/SERVICES/HIF/sdio/linux/if_ath_sdio.c @@ -49,6 +49,7 @@ #include "pktlog_ac_api.h" #include "pktlog_ac.h" #endif +#include "epping_main.h" #ifndef ATH_BUS_PM #ifdef CONFIG_PM @@ -162,6 +163,12 @@ ath_hif_sdio_probe(void *context, void *hif_handle) VOS_TRACE(VOS_MODULE_ID_HIF, VOS_TRACE_LEVEL_INFO," hdd_wlan_startup success!"); } + /* epping is minimum ethernet driver and the + * epping fw does not support pktlog, etc. + * After hdd_wladriver is epping directly return. */ + if (WLAN_IS_EPPING_ENABLED(vos_get_conparam())) + goto end; + #ifndef REMOVE_PKT_LOG if (vos_get_conparam() != VOS_FTM_MODE) { /* @@ -173,7 +180,7 @@ ath_hif_sdio_probe(void *context, void *hif_handle) printk(KERN_ERR "%s: pktlogmod_init failed\n", __func__); } #endif - +end: return 0; err_attach2: @@ -211,7 +218,8 @@ ath_hif_sdio_remove(void *context, void *hif_handle) athdiag_procfs_remove(); #ifndef REMOVE_PKT_LOG - if (vos_get_conparam() != VOS_FTM_MODE){ + if (vos_get_conparam() != VOS_FTM_MODE && + !WLAN_IS_EPPING_ENABLED(vos_get_conparam())){ if (sc && sc->ol_sc) pktlogmod_exit(sc->ol_sc); } |