diff options
Diffstat (limited to 'drivers/staging/vt6656/80211mgr.c')
| -rw-r--r-- | drivers/staging/vt6656/80211mgr.c | 297 | 
1 files changed, 72 insertions, 225 deletions
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c index fceec4999c3..61edb51f383 100644 --- a/drivers/staging/vt6656/80211mgr.c +++ b/drivers/staging/vt6656/80211mgr.c @@ -27,8 +27,6 @@   * Functions:   *      vMgrEncodeBeacon - Encode the Beacon frame   *      vMgrDecodeBeacon - Decode the Beacon frame - *      vMgrEncodeIBSSATIM - Encode the IBSS ATIM frame - *      vMgrDecodeIBSSATIM - Decode the IBSS ATIM frame   *      vMgrEncodeDisassociation - Encode the Disassociation frame   *      vMgrDecodeDisassociation - Decode the Disassociation frame   *      vMgrEncodeAssocRequest - Encode the Association request frame @@ -46,38 +44,20 @@   *      vMgrEncodeDeauthen - Encode the DeAuthentication frame   *      vMgrDecodeDeauthen - Decode the DeAuthentication frame   *      vMgrEncodeReassocResponse - Encode the Reassociation response frame - *      vMgrDecodeReassocResponse - Decode the Reassociation response frame   *   * Revision History:   *   */ +#include "device.h"  #include "tmacro.h"  #include "tether.h"  #include "80211mgr.h"  #include "80211hdr.h" -#include "device.h"  #include "wpa.h" -/*---------------------  Static Definitions -------------------------*/ - - - -/*---------------------  Static Classes  ----------------------------*/ - -/*---------------------  Static Variables  --------------------------*/ -  static int          msglevel                = MSG_LEVEL_INFO;  /*static int          msglevel                =MSG_LEVEL_DEBUG;*/ -/*---------------------  Static Functions  --------------------------*/ - - - -/*---------------------  Export Variables  --------------------------*/ - - -/*---------------------  Export Functions  --------------------------*/ -  /*+   * @@ -96,12 +76,13 @@ vMgrEncodeBeacon(  {      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; -    /* Fixed Fields */ -    pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                                    + WLAN_BEACON_OFF_TS); -    pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +	/* Fixed Fields */ +	pFrame->pqwTimestamp = +		(u64 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) + +			WLAN_BEACON_OFF_TS); +    pFrame->pwBeaconInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                         + WLAN_BEACON_OFF_BCN_INT); -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_BEACON_OFF_CAPINFO);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_BEACON_OFF_SSID; @@ -120,7 +101,6 @@ vMgrEncodeBeacon(   *  -*/ -  void  vMgrDecodeBeacon(        PWLAN_FR_BEACON  pFrame @@ -130,18 +110,19 @@ vMgrDecodeBeacon(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; -    /* Fixed Fields */ -    pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                                    + WLAN_BEACON_OFF_TS); -    pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +	/* Fixed Fields */ +	pFrame->pqwTimestamp = +		(u64 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) + +			WLAN_BEACON_OFF_TS); +    pFrame->pwBeaconInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                         + WLAN_BEACON_OFF_BCN_INT); -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_BEACON_OFF_CAPINFO);      /* Information elements */ -    pItem = (PWLAN_IE)((PBYTE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))) +    pItem = (PWLAN_IE)((u8 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))                         + WLAN_BEACON_OFF_SSID); -    while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { +    while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {          switch (pItem->byElementID) {          case WLAN_EID_SSID: @@ -178,7 +159,7 @@ vMgrDecodeBeacon(              break;          case WLAN_EID_RSN_WPA:              if (pFrame->pRSNWPA == NULL) { -                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE) +                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)                      pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;              }              break; @@ -222,59 +203,10 @@ vMgrDecodeBeacon(                  break;          } -        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); +        pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);      } - -    return; -} - - -/*+ - * - * Routine Description: - *  Encode IBSS ATIM - * - * - * Return Value: - *    None. - * --*/ - - -void -vMgrEncodeIBSSATIM( -      PWLAN_FR_IBSSATIM   pFrame -    ) -{ -    pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; -    pFrame->len = WLAN_HDR_ADDR3_LEN; - -    return;  } - -/*+ - * - * Routine Description: - *  Decode IBSS ATIM - * - * - * Return Value: - *    None. - * --*/ - -void -vMgrDecodeIBSSATIM( -      PWLAN_FR_IBSSATIM   pFrame -    ) -{ -    pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; - -    return; -} - -  /*+   *   * Routine Description: @@ -293,16 +225,12 @@ vMgrEncodeDisassociation(  {      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; -      /* Fixed Fields */ -    pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwReason = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_DISASSOC_OFF_REASON);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DISASSOC_OFF_REASON + sizeof(*(pFrame->pwReason)); - -    return;  } -  /*+   *   * Routine Description: @@ -322,10 +250,8 @@ vMgrDecodeDisassociation(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwReason = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_DISASSOC_OFF_REASON); - -    return;  }  /*+ @@ -339,7 +265,6 @@ vMgrDecodeDisassociation(   *  -*/ -  void  vMgrEncodeAssocRequest(        PWLAN_FR_ASSOCREQ  pFrame @@ -347,15 +272,13 @@ vMgrEncodeAssocRequest(  {      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_ASSOCREQ_OFF_CAP_INFO); -    pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwListenInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                         + WLAN_ASSOCREQ_OFF_LISTEN_INT);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCREQ_OFF_LISTEN_INT + sizeof(*(pFrame->pwListenInterval)); -    return;  } -  /*+   *   * Routine Description: (AP) @@ -376,16 +299,16 @@ vMgrDecodeAssocRequest(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_ASSOCREQ_OFF_CAP_INFO); -    pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwListenInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_ASSOCREQ_OFF_LISTEN_INT);      /* Information elements */      pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                              + WLAN_ASSOCREQ_OFF_SSID); -    while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { +    while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {          switch (pItem->byElementID) {          case WLAN_EID_SSID:              if (pFrame->pSSID == NULL) @@ -402,7 +325,7 @@ vMgrDecodeAssocRequest(              break;          case WLAN_EID_RSN_WPA:              if (pFrame->pRSNWPA == NULL) { -                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE) +                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)                      pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;              }              break; @@ -416,9 +339,8 @@ vMgrDecodeAssocRequest(                      pItem->byElementID);              break;          } -        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); +        pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);      } -    return;  }  /*+ @@ -440,19 +362,16 @@ vMgrEncodeAssocResponse(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_ASSOCRESP_OFF_CAP_INFO); -    pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwStatus = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_ASSOCRESP_OFF_STATUS); -    pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwAid = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                              + WLAN_ASSOCRESP_OFF_AID);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCRESP_OFF_AID                    + sizeof(*(pFrame->pwAid)); - -    return;  } -  /*+   *   * Routine Description: @@ -474,11 +393,11 @@ vMgrDecodeAssocResponse(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_ASSOCRESP_OFF_CAP_INFO); -    pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwStatus = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_ASSOCRESP_OFF_STATUS); -    pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwAid = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                              + WLAN_ASSOCRESP_OFF_AID);      /* Information elements */ @@ -486,18 +405,15 @@ vMgrDecodeAssocResponse(                             + WLAN_ASSOCRESP_OFF_SUPP_RATES);      pItem = (PWLAN_IE)(pFrame->pSuppRates); -    pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); +    pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); -    if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) { +    if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {          pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;          DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem); -    } else { +	} else          pFrame->pExtSuppRates = NULL; -    } -    return;  } -  /*+   *   * Routine Description: @@ -517,18 +433,15 @@ vMgrEncodeReassocRequest(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_REASSOCREQ_OFF_CAP_INFO); -    pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwListenInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                        + WLAN_REASSOCREQ_OFF_LISTEN_INT);      pFrame->pAddrCurrAP = (PIEEE_ADDR)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                         + WLAN_REASSOCREQ_OFF_CURR_AP);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCREQ_OFF_CURR_AP + sizeof(*(pFrame->pAddrCurrAP)); - -    return;  } -  /*+   *   * Routine Description: (AP) @@ -540,7 +453,6 @@ vMgrEncodeReassocRequest(   *  -*/ -  void  vMgrDecodeReassocRequest(        PWLAN_FR_REASSOCREQ  pFrame @@ -550,9 +462,9 @@ vMgrDecodeReassocRequest(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_REASSOCREQ_OFF_CAP_INFO); -    pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwListenInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                        + WLAN_REASSOCREQ_OFF_LISTEN_INT);      pFrame->pAddrCurrAP = (PIEEE_ADDR)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                         + WLAN_REASSOCREQ_OFF_CURR_AP); @@ -561,7 +473,7 @@ vMgrDecodeReassocRequest(      pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                         + WLAN_REASSOCREQ_OFF_SSID); -    while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { +    while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {          switch (pItem->byElementID) {          case WLAN_EID_SSID: @@ -578,10 +490,9 @@ vMgrDecodeReassocRequest(                  pFrame->pRSN = (PWLAN_IE_RSN)pItem;              break;          case WLAN_EID_RSN_WPA: -            if (pFrame->pRSNWPA == NULL) { -                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE) +		if (pFrame->pRSNWPA == NULL) +                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)                      pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem; -            }              break;          case WLAN_EID_EXTSUPP_RATES: @@ -593,13 +504,10 @@ vMgrDecodeReassocRequest(                          pItem->byElementID);              break;          } -        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); +        pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);      } -    return;  } - -  /*+   *   * Routine Description: @@ -611,7 +519,6 @@ vMgrDecodeReassocRequest(   *  -*/ -  void  vMgrEncodeProbeRequest(       PWLAN_FR_PROBEREQ  pFrame @@ -619,7 +526,6 @@ vMgrEncodeProbeRequest(  {      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      pFrame->len = WLAN_HDR_ADDR3_LEN; -    return;  }  /*+ @@ -645,7 +551,7 @@ vMgrDecodeProbeRequest(      /* Information elements */      pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))); -    while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { +    while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {          switch (pItem->byElementID) {          case WLAN_EID_SSID: @@ -668,12 +574,10 @@ vMgrDecodeProbeRequest(              break;          } -        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 +  pItem->len); +        pItem = (PWLAN_IE)(((u8 *)pItem) + 2 +  pItem->len);      } -    return;  } -  /*+   *   * Routine Description: @@ -685,7 +589,6 @@ vMgrDecodeProbeRequest(   *  -*/ -  void  vMgrEncodeProbeResponse(       PWLAN_FR_PROBERESP  pFrame @@ -693,22 +596,19 @@ vMgrEncodeProbeResponse(  {      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; -    /* Fixed Fields */ -    pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                                    + WLAN_PROBERESP_OFF_TS); -    pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +	/* Fixed Fields */ +	pFrame->pqwTimestamp = +		(u64 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) + +			WLAN_PROBERESP_OFF_TS); +    pFrame->pwBeaconInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                         + WLAN_PROBERESP_OFF_BCN_INT); -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_PROBERESP_OFF_CAP_INFO);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_PROBERESP_OFF_CAP_INFO +                    sizeof(*(pFrame->pwCapInfo)); - -    return;  } - -  /*+   *   * Routine Description: @@ -727,22 +627,22 @@ vMgrDecodeProbeResponse(  {      PWLAN_IE    pItem; -      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; -    /* Fixed Fields */ -    pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                                    + WLAN_PROBERESP_OFF_TS); -    pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +	/* Fixed Fields */ +	pFrame->pqwTimestamp = +		(u64 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) + +			WLAN_PROBERESP_OFF_TS); +    pFrame->pwBeaconInterval = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                         + WLAN_PROBERESP_OFF_BCN_INT); -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_PROBERESP_OFF_CAP_INFO);      /* Information elements */      pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                         + WLAN_PROBERESP_OFF_SSID); -    while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { +    while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {          switch (pItem->byElementID) {          case WLAN_EID_SSID:              if (pFrame->pSSID == NULL) @@ -773,7 +673,7 @@ vMgrDecodeProbeResponse(              break;          case WLAN_EID_RSN_WPA:              if (pFrame->pRSNWPA == NULL) { -                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE) +                if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)                      pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;              }              break; @@ -816,12 +716,10 @@ vMgrDecodeProbeResponse(              break;          } -        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 +  pItem->len); +        pItem = (PWLAN_IE)(((u8 *)pItem) + 2 +  pItem->len);      } -    return;  } -  /*+   *   * Routine Description: @@ -841,17 +739,15 @@ vMgrEncodeAuthen(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwAuthAlgorithm = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwAuthAlgorithm = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                        + WLAN_AUTHEN_OFF_AUTH_ALG); -    pFrame->pwAuthSequence = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwAuthSequence = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                       + WLAN_AUTHEN_OFF_AUTH_SEQ); -    pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwStatus = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_AUTHEN_OFF_STATUS);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_AUTHEN_OFF_STATUS + sizeof(*(pFrame->pwStatus)); -    return;  } -  /*+   *   * Routine Description: @@ -873,23 +769,21 @@ vMgrDecodeAuthen(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwAuthAlgorithm = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwAuthAlgorithm = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                        + WLAN_AUTHEN_OFF_AUTH_ALG); -    pFrame->pwAuthSequence = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwAuthSequence = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                       + WLAN_AUTHEN_OFF_AUTH_SEQ); -    pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwStatus = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_AUTHEN_OFF_STATUS);      /* Information elements */      pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                         + WLAN_AUTHEN_OFF_CHALLENGE); -    if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE)) +    if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE))          pFrame->pChallenge = (PWLAN_IE_CHALLENGE)pItem; -    return;  } -  /*+   *   * Routine Description: @@ -909,13 +803,11 @@ vMgrEncodeDeauthen(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwReason = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_DEAUTHEN_OFF_REASON);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DEAUTHEN_OFF_REASON + sizeof(*(pFrame->pwReason)); -    return;  } -  /*+   *   * Routine Description: @@ -935,12 +827,10 @@ vMgrDecodeDeauthen(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwReason = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_DEAUTHEN_OFF_REASON); -    return;  } -  /*+   *   * Routine Description: (AP) @@ -960,55 +850,12 @@ vMgrEncodeReassocResponse(      pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;      /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                  + WLAN_REASSOCRESP_OFF_CAP_INFO); -    pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwStatus = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                                 + WLAN_REASSOCRESP_OFF_STATUS); -    pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) +    pFrame->pwAid = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))                              + WLAN_REASSOCRESP_OFF_AID);      pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID + sizeof(*(pFrame->pwAid)); -    return; -} - - -/*+ - * - * Routine Description: - *   Decode Reassociation Response - * - * - * Return Value: - *    None. - * --*/ - - -void -vMgrDecodeReassocResponse( -      PWLAN_FR_REASSOCRESP  pFrame -     ) -{ -    PWLAN_IE   pItem; - -    pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; - -    /* Fixed Fields */ -    pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                                + WLAN_REASSOCRESP_OFF_CAP_INFO); -    pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                               + WLAN_REASSOCRESP_OFF_STATUS); -    pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                            + WLAN_REASSOCRESP_OFF_AID); - -    /* Information elements */ -    pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) -                                               + WLAN_REASSOCRESP_OFF_SUPP_RATES); - -    pItem = (PWLAN_IE)(pFrame->pSuppRates); -    pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); - -    if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) -        pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem; -    return;  }  | 
