commit 228d0c5c643f5b0a99d8cdaf690aacb360c8097a
author AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> Mon Nov 09 12:32:21 2015 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Nov 09 06:48:32 2015 -0800
tree a40db2caffe341448d46bb02409ec7bf44c6e9cb
parent b2a0c830b3716b82e7d7b2f135e4598a07689d6e

Revert "Wlan: Allow Re-assoc to same AP only in open security mode"

This reverts commit 101987ca9f08b5adb07003882bb8df7be8c8ffea.
Revert this change to allow re-association to same AP which is
required for HS certification.

Change-Id: I75114b5e36b4ce6def602b9054481845ac09c56a
CRs-Fixed: 936342

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 4eb2ff1..d9f1df3 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3751,22 +3751,14 @@
            if (VOS_TRUE == vos_mem_compare(targetApBssid,
                                            pHddStaCtx->conn_info.bssId, sizeof(tSirMacAddr)))
            {
-               /* Reassoc to same AP, only supported for Open Security*/
-               if ((pHddStaCtx->conn_info.ucEncryptionType ||
-                   pHddStaCtx->conn_info.mcEncryptionType))
-               {
-                   hddLog(LOGE,
-                      FL("Reassoc to same AP, only supported for Open Security"));
-                   ret = -ENOTSUPP;
-                   goto exit;
-               }
-               hddLog(LOG1,
-                     FL("11r Reassoc BSSID is same as currently associated AP bssid"));
+               VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+                         "%s:11r Reassoc BSSID is same as currently associated AP bssid",
+                         __func__);
                sme_GetModifyProfileFields(hHal, pAdapter->sessionId,
                                        &modProfileFields);
                sme_RoamReassoc(hHal, pAdapter->sessionId,
                             NULL, modProfileFields, &roamId, 1);
-               goto exit;
+               return 0;
            }
 
            /* Check channel number is a valid channel number */
@@ -3775,8 +3767,7 @@
            {
                hddLog(VOS_TRACE_LEVEL_ERROR,
                       "%s: Invalid Channel  [%d]", __func__, channel);
-               ret = -EINVAL;
-               goto exit;
+               return -EINVAL;
            }
 
            trigger = eSME_ROAM_TRIGGER_SCAN;