commit d5c3127beffddeb58b2de3f82049a8ace3bd058d
author Abhishek Singh <absingh@qti.qualcomm.com> Fri Mar 07 14:46:50 2014 +0530
committer AnjaneeDevi Kapparapu <akappa@codeaurora.org> Thu Mar 13 11:03:53 2014 +0530
tree afcdacb8b88cbb8ce1f4c81005c2eb81cea47afd
parent 99036f7d3d62a328d1193940b339cfcf30301dd7

wlan: Use privacy bit to filter Beacon/Probe Rsp in IBSS.

The IBSS with open security mode, is able to add the peer with
WPA-NONE security mode. Vice versa is also possible.

Adds a check to filter out the recieved Beacon/Probe Rsp in IBSS,
if the privacy bit in beacon/probe rsp doesnt match the privacy
bit of the IBSS.

Change-Id: I7b05d58b36d89b488bf01950c73ca21ad26a93f0
CRs-Fixed: 626001

CORE/MAC/src/pe/lim/limApi.c

diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 6f9f465..e0fd4ac 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1698,6 +1698,8 @@
 
     pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo);
     if ( (!pBeacon->capabilityInfo.ibss) ||
+         ( psessionEntry->privacy !=
+                  (tANI_U8)pBeacon->capabilityInfo.privacy ) ||
          (limCmpSSid(pMac, &pBeacon->ssId,psessionEntry) != true) ||
          (psessionEntry->currentOperChannel != pBeacon->channelNumber) )
         /* Received SSID does not match => Ignore received Beacon frame. */

CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c

diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 41e2518..77f653e 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -683,6 +683,16 @@
                  psessionEntry->shortSlotTimeSupported =
                         limGetShortSlotFromPhyMode(pMac, psessionEntry,
                                                    psessionEntry->gLimPhyMode);
+                 /* In WPA-NONE case we wont get the privacy bit in ibss config
+                  * from supplicant, but we are updating WNI_CFG_PRIVACY_ENABLED
+                  * on basis of Encryption type in csrRoamSetBssConfigCfg. So
+                  * get the privacy info from WNI_CFG_PRIVACY_ENABLED
+                  */
+                 if (wlan_cfgGetInt(pMac, WNI_CFG_PRIVACY_ENABLED, &val)
+                                                               != eSIR_SUCCESS)
+                      limLog(pMac, LOGE, FL("cfg get WNI_CFG_PRIVACY_ENABLED"
+                            " failed"));
+                 psessionEntry->privacy =(tANI_U8) val;
                  psessionEntry->isCoalesingInIBSSAllowed =
                                 pSmeStartBssReq->isCoalesingInIBSSAllowed;
                  break;

CORE/MAC/src/pe/sch/schBeaconProcess.c

diff --git a/CORE/MAC/src/pe/sch/schBeaconProcess.c b/CORE/MAC/src/pe/sch/schBeaconProcess.c
index cbf33fa..b7425fd 100644
--- a/CORE/MAC/src/pe/sch/schBeaconProcess.c
+++ b/CORE/MAC/src/pe/sch/schBeaconProcess.c
@@ -349,7 +349,9 @@
 
     if(eLIM_STA_IN_IBSS_ROLE == psessionEntry->limSystemRole )
     {
-        limHandleIBSScoalescing(pMac, pBeacon,  pRxPacketInfo, psessionEntry);
+        if( limHandleIBSScoalescing(pMac, pBeacon, pRxPacketInfo, psessionEntry)
+                                                               != eSIR_SUCCESS )
+            return;
     }
     else if(  (eLIM_STA_ROLE == psessionEntry->limSystemRole) || 
                   (eLIM_BT_AMP_STA_ROLE == psessionEntry->limSystemRole))