From a5464e928fa1e7b41f5d64183f4a22e8a1670c02 Mon Sep 17 00:00:00 2001 From: Yuanyuan Liu Date: Mon, 11 Aug 2014 13:39:17 -0700 Subject: qcacld: Add connection mode check before sending nlink msg In FTM mode, nlink socket it not initialized. Add connection mode check before sending nlink msg, to avoid using invalid nlink socket handler in FTM mode. Also, set isLoadInProgress to FALSE after driver is loaded in FTM mode. Change-Id: I50dff2c7bbc7817e53bc1f96927c82409422e840 CRs-Fixed: 707889 --- CORE/HDD/src/wlan_hdd_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index f8a396b178e8..0a649598a553 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -11403,6 +11403,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) } #endif vos_set_load_unload_in_progress(VOS_MODULE_ID_VOSS, FALSE); + pHddCtx->isLoadInProgress = FALSE; hddLog(VOS_TRACE_LEVEL_FATAL,"%s: FTM driver loaded", __func__); complete(&wlan_start_comp); return VOS_STATUS_SUCCESS; @@ -13237,6 +13238,9 @@ void wlan_hdd_send_status_pkg(hdd_adapter_t *pAdapter, return; #endif + if (VOS_FTM_MODE == hdd_get_conparam()) + return; + memset(&data, 0, sizeof(struct wlan_status_data)); if (is_on) ret = wlan_hdd_gen_wlan_status_pack(&data, pAdapter, pHddStaCtx, @@ -13267,6 +13271,9 @@ void wlan_hdd_send_version_pkg(v_U32_t fw_version, return; #endif + if (VOS_FTM_MODE == hdd_get_conparam()) + return; + memset(&data, 0, sizeof(struct wlan_version_data)); ret = wlan_hdd_gen_wlan_version_pack(&data, fw_version, chip_id, chip_name); if (!ret) -- cgit v1.2.3