diff options
| author | Gao Wu <wugao@qti.qualcomm.com> | 2016-05-04 15:55:40 +0800 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-05-04 19:27:00 +0530 |
| commit | b69f6a7849e6b3d53df637e99992e13e174ad519 (patch) | |
| tree | 2953f127517620cabebcae087a92af33dedf311a | |
| parent | be259822089a56046ff23c505ec111de30594359 (diff) | |
qcacld-2.0: use correct bssid and method to indicate assoc failure
It use bssid in pWextState to indicate assoc failure, this lead to
up layer mismatch for assoc bssid is zero case. By the way, it use
wrong method to indicate at this time.
Change-Id: I1b237e70d30f08c364d5aa56182676affdfee105
CRs-Fixed: 1010832
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_assoc.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 16234d95182f..b675f1c989d9 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -1654,7 +1654,6 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs hdd_adapter_t *sap_adapter; hdd_ap_ctx_t *hdd_ap_ctx; uint8_t default_sap_channel = 6; - u16 reason_code; #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (pRoamInfo && pRoamInfo->roamSynchInProgress) { /* change logging before release */ @@ -2160,12 +2159,18 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs } else { - reason_code = WLAN_STATUS_UNSPECIFIED_FAILURE; - if (pRoamInfo && pRoamInfo->reasonCode) - reason_code = (u16)pRoamInfo->reasonCode; - - cfg80211_connect_result(dev, pWextState->req_bssId, - NULL, 0, NULL, 0, reason_code, GFP_KERNEL); + if (pRoamInfo) + hdd_connect_result(dev, pRoamInfo->bssid, NULL, + NULL, 0, NULL, 0, + pRoamInfo->reasonCode ? + pRoamInfo->reasonCode : + WLAN_STATUS_UNSPECIFIED_FAILURE, + GFP_KERNEL); + else + hdd_connect_result(dev, pWextState->req_bssId, NULL, + NULL, 0, NULL, 0, + WLAN_STATUS_UNSPECIFIED_FAILURE, + GFP_KERNEL); } /* Clear the roam profile */ hdd_clearRoamProfileIe(pAdapter); |