diff options
| author | Sandeep Puligilla <spuligil@codeaurora.org> | 2016-07-21 10:58:53 -0700 |
|---|---|---|
| committer | Vishwajith Upendra <vishwaji@codeaurora.org> | 2016-08-01 13:33:24 -0700 |
| commit | 0241f010fef898631242eddfbc9e62c1f9953c69 (patch) | |
| tree | 817e86b7b5b08f02a72ecf5c60ba247eeb441d93 | |
| parent | 3d2540f06b2d63fe5665ed888a213324e5144a04 (diff) | |
qcacld-3.0: Handle eCSR_ROAM_CANCELLED at HDD
connection status is not updated at HDD because
eCSR_ROAM_CANCELLED is not handled at hdd callback.
Added support for eCSR_ROAM_CANCELLED so that HDD updates
connection status to upper layers.
Change-Id: I4c185bb3a370a0562de6431fde8952c68789de53
CRs-Fixed: 1043090
| -rw-r--r-- | core/hdd/src/wlan_hdd_assoc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 9b0d63f924a9..21b5f35338c5 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -2906,6 +2906,13 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, GFP_KERNEL); } hdd_clear_roam_profile_ie(pAdapter); + } else if ((eCSR_ROAM_CANCELLED == roamStatus + && !hddDisconInProgress)) { + cfg80211_connect_result(dev, + pWextState->req_bssId.bytes, + NULL, 0, NULL, 0, + WLAN_STATUS_UNSPECIFIED_FAILURE, + GFP_KERNEL); } if (pRoamInfo) { @@ -2923,9 +2930,10 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, /* * Set connection state to eConnectionState_NotConnected only * when CSR has completed operation - with a - * ASSOCIATION_FAILURE status. + * ASSOCIATION_FAILURE or eCSR_ROAM_CANCELLED status. */ - if (eCSR_ROAM_ASSOCIATION_FAILURE == roamStatus + if (((eCSR_ROAM_ASSOCIATION_FAILURE == roamStatus) || + (eCSR_ROAM_CANCELLED == roamStatus)) && !hddDisconInProgress) { hdd_conn_set_connection_state(pAdapter, eConnectionState_NotConnected); @@ -4771,6 +4779,8 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, pRoamInfo->roamSynchInProgress = false; #endif break; + case eCSR_ROAM_CANCELLED: + hdd_info("****eCSR_ROAM_CANCELLED****"); case eCSR_ROAM_ASSOCIATION_FAILURE: qdf_ret_status = hdd_association_completion_handler(pAdapter, pRoamInfo, |