diff options
| author | Wu Gao <wugao@codeaurora.org> | 2016-11-23 17:50:56 +0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-11-29 16:07:54 -0800 |
| commit | 89f53aa5205ba34b268d68e7fc62aa60bae289da (patch) | |
| tree | 191c8c3a6346fc9e5311d429aebf3337eb1d790a | |
| parent | da7c3b21627599f3423b56697ecc6e84bd8bcae1 (diff) | |
qcacld-3.0: Send protocol reason code instead of generic reason
propagation from qcacld-2.0 to qcacld-3.0
When assoc fail, send protocol reason code instead of generic
reason code. Customer complain that it just reports generic
reason for WPA2 AP and cause UI mismatch.
Change-Id: I1b237e70d30f08c364d5aa56182676affdfee105
CRs-Fixed: 1010832
| -rw-r--r-- | core/hdd/src/wlan_hdd_assoc.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 3b7a7fec8631..7401849c3061 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -2822,43 +2822,16 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, GFP_KERNEL, connect_timeout); } else { - if (pRoamInfo) { - eCsrAuthType authType = - pWextState->roamProfile.AuthType. - authType[0]; - eCsrEncryptionType encryption_type = - pWextState->roamProfile. - EncryptionType.encryptionType[0]; - bool isWep = - (((authType == - eCSR_AUTH_TYPE_OPEN_SYSTEM) || - (authType == - eCSR_AUTH_TYPE_SHARED_KEY)) && - ((encryption_type == - eCSR_ENCRYPT_TYPE_WEP40) || - (encryption_type == - eCSR_ENCRYPT_TYPE_WEP104) || - (encryption_type == - eCSR_ENCRYPT_TYPE_WEP40_STATICKEY) || - (encryption_type == - eCSR_ENCRYPT_TYPE_WEP104_STATICKEY))); - /* - * In case of OPEN-WEP or SHARED-WEP - * authentication, send exact protocol - * reason code. This enables user - * applications to reconnect the station - * with correct configuration. - */ + if (pRoamInfo) hdd_connect_result(dev, pRoamInfo->bssid.bytes, NULL, NULL, 0, NULL, 0, - (isWep && - pRoamInfo->reasonCode) ? + pRoamInfo->reasonCode ? pRoamInfo->reasonCode : WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_KERNEL, connect_timeout); - } else + else hdd_connect_result(dev, pWextState->req_bssId.bytes, NULL, NULL, 0, NULL, 0, |