From 09bcc35fb4fd2efb5c935ffc801a3c4e3ddcc331 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Sat, 7 Feb 2015 18:00:28 -0800 Subject: qcacld-2.0: Switch off the carrier in case of NULL bss This is prima to qcacld-2.0 propagation. In hdd_AssociationCompletionHandler, if we get NULL bss from wlan_hdd_cfg80211_update_bss_db, it returns from there only. But when it does, hdd_AssociationCompletionHandler has to make sure that it does not leave the carrier on with TX queues enabled, this leads to hdd_tx_timeout being called continuously. This crash is avoided by turning off the carrier when wlan_hdd_cfg80211_update_bss_db fails. Change-Id: I010e5e821a307af85e369594930706b458f78827 CRs-Fixed: 792770 --- CORE/HDD/src/wlan_hdd_assoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index fd54e47dbeff..f1e8f822ca54 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -1576,9 +1576,9 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs /* add bss_id to cfg80211 data base */ bss = wlan_hdd_cfg80211_update_bss_db(pAdapter, pRoamInfo); - if (NULL == bss) - { + if (NULL == bss) { pr_err("wlan: Not able to create BSS entry\n"); + netif_carrier_off(dev); return eHAL_STATUS_FAILURE; } #ifdef WLAN_FEATURE_VOWIFI_11R -- cgit v1.2.3