diff options
| author | Ryan Hsu <ryanhsu@qca.qualcomm.com> | 2016-03-25 10:46:47 -0700 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-04-12 14:36:53 +0530 |
| commit | 69ba85355ccd9db6ae40d1797e05882e63fadf4b (patch) | |
| tree | 57131dcacc2aa55a1dea7057919d56c3ab0c1bf2 | |
| parent | 41c48b8b73b50fd040c052ef848b5e9911daf5dc (diff) | |
qcacld-2.0: Avoid failing driver when cesium_nl_sock failed
In the dual wifi instances, the 2nd cesium_nl_sock initialization
will fail due to the first driver has registered the socket.
This doesn't have to fail the driver to be up running, so simply
print a warning in this case.
Also add a check in the case to use the cesium_nl_sock to make sure
it is properly used only when it is initialized.
Change-Id: Ia62d606c1400b437f08c28951d6a6a77428f73b1
CRs-fixed: 995038
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 95327fd9c74f..a647bb592e5c 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -9339,10 +9339,9 @@ static void hdd_tx_fail_ind_callback(v_U8_t *MacAddr, v_U8_t seqNo) payload_len = ETH_ALEN; - if (0 == cesium_pid) - { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: cesium process not registered", - __func__); + if (0 == cesium_pid || cesium_nl_srv_sock == NULL) { + hddLog(LOGE, FL("cesium process not registered, pid: %d, nl_sock: %p"), + cesium_pid, cesium_nl_srv_sock); return; } @@ -14831,10 +14830,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) #endif if (hdd_open_cesium_nl_sock() < 0) - { - hddLog(VOS_TRACE_LEVEL_FATAL,"%s: hdd_open_cesium_nl_sock failed", __func__); - goto err_nl_srv; - } + hddLog(VOS_TRACE_LEVEL_WARN, FL("hdd_open_cesium_nl_sock failed")); //Initialize the CNSS-DIAG service if (cnss_diag_activate_service() < 0) |