Revert "wifi: Scan list not updated with correct APs on band change."

prima to qcacld-2.0 propagation

This reverts change-id Iaa5b3c8d42107ecf2f7076abaca57f6c5687423d

In the current implementation, DUT doesn't initialize the social
channels 1, 6 and 11 and doesn't support P2P discovery in 5GHz only
mode. So we don't see any AP's on 1, 6 and 11 channels during p2p
scan and also the change-id "Iaa5b3c8d42107ecf2f7076abaca57f6c5687423d"
is not required.

Change-Id: I317119bbbc30d44214c11076faceba8101cf835a
CRs-Fixed: 962252

3 files changed, 24 insertions, 39 deletions

diff --git a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
index b86eb352b2df..eff17d221f5b 100644
--- a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
@@ -153,10 +153,15 @@ limProcessBeaconFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession ps
         if ((pMac->lim.gLimMlmState  == eLIM_MLM_WT_PROBE_RESP_STATE) ||
             (pMac->lim.gLimMlmState  == eLIM_MLM_PASSIVE_SCAN_STATE))
         {
-            limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo,
-                  ((pMac->lim.gLimHalScanState == eLIM_HAL_SCANNING_STATE) ?
-                    eANI_BOOLEAN_TRUE : eANI_BOOLEAN_FALSE),
-                    eANI_BOOLEAN_FALSE);
+            /* If we are scanning for P2P, only accept probe rsp */
+            if((pMac->lim.gLimHalScanState != eLIM_HAL_SCANNING_STATE) ||
+               (NULL == pMac->lim.gpLimMlmScanReq) ||
+               !pMac->lim.gpLimMlmScanReq->p2pSearch) {
+                limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo,
+                     ((pMac->lim.gLimHalScanState == eLIM_HAL_SCANNING_STATE) ?
+                     eANI_BOOLEAN_TRUE : eANI_BOOLEAN_FALSE),
+                     eANI_BOOLEAN_FALSE);
+            }
             /* Calling dfsChannelList which will convert DFS channel
              * to Active channel for x secs if this channel is DFS channel */
              limSetDFSChannelList(pMac, pBeacon->channelNumber,
@@ -282,8 +287,13 @@ limProcessBeaconFrameNoSession(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo)
         if ( (pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) ||
              (pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) )
         {
-            limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo,
-                                         eANI_BOOLEAN_TRUE, eANI_BOOLEAN_FALSE);
+            /*If we are scanning for P2P, only accept probe rsp */
+            if((pMac->lim.gLimHalScanState != eLIM_HAL_SCANNING_STATE) ||
+               (NULL == pMac->lim.gpLimMlmScanReq) ||
+               !pMac->lim.gpLimMlmScanReq->p2pSearch) {
+                limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo,
+                      eANI_BOOLEAN_TRUE, eANI_BOOLEAN_FALSE);
+            }
             /* Calling dfsChannelList which will convert DFS channel
              * to Active channel for x secs if this channel is DFS channel */
             limSetDFSChannelList(pMac, pBeacon->channelNumber,
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c
index ed04db70f821..db6c5f282456 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.c
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c
@@ -125,14 +125,14 @@ limDeactivateMinChannelTimerDuringScan(tpAniSirGlobal pMac)
  * @return None
  */
 #if defined WLAN_FEATURE_VOWIFI
-eHalStatus
+void
 limCollectBssDescription(tpAniSirGlobal pMac,
                          tSirBssDescription *pBssDescr,
                          tpSirProbeRespBeacon pBPR,
                          tANI_U8  *pRxPacketInfo,
                          tANI_U8  fScanning)
 #else
-eHalStatus
+void
 limCollectBssDescription(tpAniSirGlobal pMac,
                          tSirBssDescription *pBssDescr,
                          tpSirProbeRespBeacon pBPR,
@@ -151,7 +151,7 @@ limCollectBssDescription(tpAniSirGlobal pMac,
     if (SIR_MAC_B_PR_SSID_OFFSET > WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo))
     {
        VOS_ASSERT(WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >= SIR_MAC_B_PR_SSID_OFFSET);
-       return eHAL_STATUS_FAILURE;
+       return;
     }
     ieLen    = WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) - SIR_MAC_B_PR_SSID_OFFSET;
     rxChannel = WDA_GET_RX_CH(pRxPacketInfo);
@@ -159,21 +159,6 @@ limCollectBssDescription(tpAniSirGlobal pMac,
     rfBand = WDA_GET_RX_RFBAND(pRxPacketInfo);
 
     /**
-     * Drop all the beacons and probe response without P2P IE during P2P search
-     */
-    if ((NULL != pMac->lim.gpLimMlmScanReq && pMac->lim.gpLimMlmScanReq->p2pSearch) ||
-            (pMac->fScanOffload && pMac->lim.fOffloadScanPending &&
-             (pMac->lim.fOffloadScanP2PSearch ||
-              pMac->lim.fOffloadScanP2PListen)))
-    {
-        if (NULL == limGetP2pIEPtr(pMac, (pBody + SIR_MAC_B_PR_SSID_OFFSET), ieLen))
-        {
-            limLog( pMac, LOG3, MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->bssId));
-            return eHAL_STATUS_FAILURE;
-        }
-    }
-
-    /**
      * Length of BSS desription is without length of
      * length itself and length of pointer
      * that holds ieFields
@@ -312,7 +297,7 @@ limCollectBssDescription(tpAniSirGlobal pMac,
         pBssDescr->length,
         ieLen );
 
-    return eHAL_STATUS_SUCCESS;
+    return;
 } /*** end limCollectBssDescription() ***/
 
 /**
@@ -540,19 +525,11 @@ limCheckAndAddBssDescription(tpAniSirGlobal pMac,
 
     // In scan state, store scan result.
 #if defined WLAN_FEATURE_VOWIFI
-    status = limCollectBssDescription(pMac, &pBssDescr->bssDescription,
+    limCollectBssDescription(pMac, &pBssDescr->bssDescription,
                              pBPR, pRxPacketInfo, fScanning);
-    if (eHAL_STATUS_SUCCESS != status)
-    {
-        goto last;
-    }
 #else
-    status = limCollectBssDescription(pMac, &pBssDescr->bssDescription,
+    limCollectBssDescription(pMac, &pBssDescr->bssDescription,
                              pBPR, pRxPacketInfo);
-    if (eHAL_STATUS_SUCCESS != status)
-    {
-        goto last;
-    }
 #endif
     pBssDescr->bssDescription.fProbeRsp = fProbeRsp;
 
@@ -627,12 +604,10 @@ limCheckAndAddBssDescription(tpAniSirGlobal pMac,
         }
     }//(eANI_BOOLEAN_TRUE == fScanning)
 
-last:
     if( eHAL_STATUS_SUCCESS != status )
     {
         vos_mem_free( pBssDescr );
     }
-    return;
 } /****** end limCheckAndAddBssDescription() ******/
 
 
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.h b/CORE/MAC/src/pe/lim/limScanResultUtils.h
index 7f04c94a49fc..4d06b9bd8afe 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.h
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.h
@@ -62,13 +62,13 @@ void    limReInitLfrScanResults(tpAniSirGlobal);
 tANI_U32 limDeactivateMinChannelTimerDuringScan(tpAniSirGlobal);
 void    limCheckAndAddBssDescription(tpAniSirGlobal, tpSirProbeRespBeacon, tANI_U8 *, tANI_BOOLEAN, tANI_U8);
 #if defined WLAN_FEATURE_VOWIFI
-eHalStatus    limCollectBssDescription(tpAniSirGlobal,
+void    limCollectBssDescription(tpAniSirGlobal,
                                  tSirBssDescription *,
                                  tpSirProbeRespBeacon,
                                  tANI_U8 *,
                                  tANI_U8);
 #else
-eHalStatus    limCollectBssDescription(tpAniSirGlobal,
+void    limCollectBssDescription(tpAniSirGlobal,
                                  tSirBssDescription *,
                                  tpSirProbeRespBeacon,
                                  tANI_U8 *);