diff options
| author | Sundar Subramaniyan <subrams@qti.qualcomm.com> | 2013-09-30 00:44:14 +0530 |
|---|---|---|
| committer | Madan Mohan Koyyalamudi <mkoyyala@qca.qualcomm.com> | 2013-10-23 19:55:17 -0700 |
| commit | 488145438af0ec8d46aa7ca5b89efa84717334a5 (patch) | |
| tree | 48cf1bc693caa0d92dcccacdb6f2c245a6a9b4cb | |
| parent | 9ef19f6c1fd549713c8bd1c0304bde1a6d3705ff (diff) | |
cld: Fix packet log init/de-init in mission mode
The packet log initialization and de-init are not done for FTM when
loaded in FTM mode. In normal mode alot, since FTM is compiled by default,
the compile time flag QCA_WIFI_FTM restricts packet log to be initialized.
Runtime checks should have been used in the place where compile time check
was done. So the fix is to replace compile time check with runtime check
on the current mode (i.e FTM or Mission mode). This will initialize and
de-initialize packet log correctly in normal mode and does not in FTM mode.
Change-Id: Idf5d7340c234de8d600ae3dc1d4d4b886a1e77cd
CRs-Fixed: 553685
| -rw-r--r-- | CORE/SERVICES/HIF/PCIe/if_pci.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c index 127c5cae36cc..5a63f151b500 100644 --- a/CORE/SERVICES/HIF/PCIe/if_pci.c +++ b/CORE/SERVICES/HIF/PCIe/if_pci.c @@ -555,15 +555,15 @@ again: } #ifndef REMOVE_PKT_LOG -#ifndef QCA_WIFI_FTM - /* - * pktlog initialization - */ - ol_pl_sethandle(&ol_sc->pdev_txrx_handle->pl_dev, ol_sc); + if (vos_get_conparam() != VOS_FTM_MODE) { + /* + * pktlog initialization + */ + ol_pl_sethandle(&ol_sc->pdev_txrx_handle->pl_dev, ol_sc); - if (pktlogmod_init(ol_sc)) - printk(KERN_ERR "%s: pktlogmod_init failed\n", __func__); -#endif + if (pktlogmod_init(ol_sc)) + printk(KERN_ERR "%s: pktlogmod_init failed\n", __func__); + } #endif #ifdef WLAN_BTAMP_FEATURE @@ -847,9 +847,8 @@ hif_pci_remove(struct pci_dev *pdev) scn = sc->ol_sc; #ifndef REMOVE_PKT_LOG -#ifndef QCA_WIFI_FTM - pktlogmod_exit(scn); -#endif + if (vos_get_conparam() != VOS_FTM_MODE) + pktlogmod_exit(scn); #endif __hdd_wlan_exit(); |