commit 38c177eb0eaf910bfad8143000e4954734ac29db
author Mahesh A Saptasagar <c_msapta@qti.qualcomm.com> Fri Oct 17 18:55:48 2014 +0530
committer AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> Mon Oct 20 16:05:41 2014 +0530
tree 147cf86416869618c9fd4ea5aefa3fd0a9b1a41b
parent bea38adc7869d273db3988e0e1e2607728589daa

Revert "wlan: Donot strip off the extended capability IE in Assoc Response."

This reverts commit bb599325e2df1ec736137fb021cf42c8877d041e.

Change-Id: I764ce6bedd65b36d112476acfb8d6aae757f51da
CRs-Fixed: 741148

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

diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index bfcec2f..49ade65 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -1350,6 +1350,9 @@
     tANI_U32             addnIELen=0;
     tANI_U8              addIE[WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN];
     tpSirAssocReq        pAssocReq = NULL; 
+    tANI_U16             addStripoffIELen = 0;
+    tDot11fIEExtCap      extractedExtCap;
+    tANI_BOOLEAN         extractedExtCapFlag = eANI_BOOLEAN_FALSE;
     tANI_U32             nBytes = 0;
 
 #ifdef WLAN_FEATURE_11W
@@ -1544,12 +1547,35 @@
                 if (wlan_cfgGetStr(pMac, WNI_CFG_ASSOC_RSP_ADDNIE_DATA,
                             &addIE[0], &addnIELen) == eSIR_SUCCESS)
                 {
+
+                    vos_mem_set(( tANI_U8* )&extractedExtCap,
+                        sizeof( tDot11fIEExtCap ), 0);
+                    nSirStatus = limStripOffExtCapIEAndUpdateStruct(pMac,
+                                      &addIE[0],
+                                      &addStripoffIELen,
+                                      &extractedExtCap );
+                    if(eSIR_SUCCESS != nSirStatus)
+                    {
+                        limLog(pMac, LOG1,
+                            FL("Unable to Stripoff ExtCap IE from Assoc Rsp"));
+                    }
+                    else
+                    {
+                        addnIELen = addStripoffIELen;
+                        extractedExtCapFlag = eANI_BOOLEAN_TRUE;
+                    }
                     nBytes = nBytes + addnIELen;
                 }
             }
         }
     }
 
+    /* merge the ExtCap struct*/
+    if (extractedExtCapFlag && extractedExtCap.present)
+    {
+        limMergeExtCapIEStruct(&(frm.ExtCap), &extractedExtCap);
+    }
+
     nStatus = dot11fGetPackedAssocResponseSize( pMac, &frm, &nPayload );
     if ( DOT11F_FAILED( nStatus ) )
     {