commit 8cecdaa82b054f5d03ebe666c038680072fc8184
author Abhishek Singh <absingh@qti.qualcomm.com> Fri May 22 14:46:40 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Tue May 26 19:59:21 2015 +0530
tree a05314495f578f3a34d91f6d924bfe68db26c39c
parent f0511f6417f8997c2b628e3296d4155edff48e1e

wlan: Use Metainfo to fill privacy bit in the frame control

For WAI frames, gUcIsWai is used to decide the privacy bit in the
frame control in case tlState is WLANTL_STA_AUTHENTICATED.
gUcIsWai can be 0 for WAI frames in some case, and thus privacy
bit of WAI frame is set. So instead use Metainfo->ucIsWai, which
is filled for all WAI frames.

CRs-Fixed: 842163
Change-Id: I077b4de8783c7af2747a3d364ab1193da7cf8126

CORE/TL/src/wlan_qct_tl.c

diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index 10b5864..0d0da27 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -346,13 +346,6 @@
   v_U16_t              * usEtherType
 );
 
-#ifdef FEATURE_WLAN_WAPI
-/*---------------------------------------------------------------------------
- * Adding a global variable to be used when doing frame translation in TxAuth
- * state so as to not set the protected bit to 1 in the case of WAI frames
- *---------------------------------------------------------------------------*/
-v_U8_t gUcIsWai;
-#endif
 
 /*----------------------------------------------------------------------------
  * Externalized Function Definitions
@@ -7936,10 +7929,6 @@
      {
         /* SW based translation */
 
-#ifdef FEATURE_WLAN_WAPI
-       gUcIsWai = tlMetaInfo.ucIsWai,
-#endif
-
        vosStatus =  WLANTL_Translate8023To80211Header( vosDataBuff, &vosStatus,
                                                     pTLCb, &ucSTAId,
                                                     &tlMetaInfo, &ucWDSEnabled,
@@ -9913,7 +9902,7 @@
 
 #ifdef FEATURE_WLAN_WAPI
   if (( WLANTL_STA_AUTHENTICATED == pClientSTA->tlState ||
-        pClientSTA->ptkInstalled ) && gUcIsWai != 1)
+        pClientSTA->ptkInstalled ) && (tlMetaInfo->ucIsWai != 1))
 #else
   if ( WLANTL_STA_AUTHENTICATED == pClientSTA->tlState ||
        pClientSTA->ptkInstalled )