summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860/sta
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rt2860/sta')
-rw-r--r--drivers/staging/rt2860/sta/assoc.c242
-rw-r--r--drivers/staging/rt2860/sta/auth.c98
-rw-r--r--drivers/staging/rt2860/sta/auth_rsp.c22
-rw-r--r--drivers/staging/rt2860/sta/connect.c202
-rw-r--r--drivers/staging/rt2860/sta/rtmp_data.c290
-rw-r--r--drivers/staging/rt2860/sta/sanity.c92
-rw-r--r--drivers/staging/rt2860/sta/sync.c260
-rw-r--r--drivers/staging/rt2860/sta/wpa.c62
8 files changed, 634 insertions, 634 deletions
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index c5a17381fc78..f2192ff16577 100644
--- a/drivers/staging/rt2860/sta/assoc.c
+++ b/drivers/staging/rt2860/sta/assoc.c
@@ -36,7 +36,7 @@
*/
#include "../rt_config.h"
-UCHAR CipherWpaTemplate[] = {
+u8 CipherWpaTemplate[] = {
0xdd, /* WPA IE */
0x16, /* Length */
0x00, 0x50, 0xf2, 0x01, /* oui */
@@ -48,7 +48,7 @@ UCHAR CipherWpaTemplate[] = {
0x00, 0x50, 0xf2, 0x01 /* authentication */
};
-UCHAR CipherWpa2Template[] = {
+u8 CipherWpa2Template[] = {
0x30, /* RSN IE */
0x14, /* Length */
0x01, 0x00, /* Version */
@@ -60,7 +60,7 @@ UCHAR CipherWpa2Template[] = {
0x00, 0x00, /* RSN capability */
};
-UCHAR Ccx2IeInfo[] = { 0x00, 0x40, 0x96, 0x03, 0x02 };
+u8 Ccx2IeInfo[] = { 0x00, 0x40, 0x96, 0x03, 0x02 };
/*
==========================================================================
@@ -73,7 +73,7 @@ UCHAR Ccx2IeInfo[] = { 0x00, 0x40, 0x96, 0x03, 0x02 };
==========================================================================
*/
-VOID AssocStateMachineInit(IN PRTMP_ADAPTER pAd,
+void AssocStateMachineInit(IN PRTMP_ADAPTER pAd,
IN STATE_MACHINE * S, OUT STATE_MACHINE_FUNC Trans[])
{
StateMachineInit(S, Trans, MAX_ASSOC_STATE, MAX_ASSOC_MSG,
@@ -165,9 +165,9 @@ VOID AssocStateMachineInit(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID AssocTimeout(IN PVOID SystemSpecific1,
- IN PVOID FunctionContext,
- IN PVOID SystemSpecific2, IN PVOID SystemSpecific3)
+void AssocTimeout(void *SystemSpecific1,
+ void *FunctionContext,
+ void *SystemSpecific2, void *SystemSpecific3)
{
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext;
@@ -193,9 +193,9 @@ VOID AssocTimeout(IN PVOID SystemSpecific1,
==========================================================================
*/
-VOID ReassocTimeout(IN PVOID SystemSpecific1,
- IN PVOID FunctionContext,
- IN PVOID SystemSpecific2, IN PVOID SystemSpecific3)
+void ReassocTimeout(void *SystemSpecific1,
+ void *FunctionContext,
+ void *SystemSpecific2, void *SystemSpecific3)
{
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext;
@@ -221,9 +221,9 @@ VOID ReassocTimeout(IN PVOID SystemSpecific1,
==========================================================================
*/
-VOID DisassocTimeout(IN PVOID SystemSpecific1,
- IN PVOID FunctionContext,
- IN PVOID SystemSpecific2, IN PVOID SystemSpecific3)
+void DisassocTimeout(void *SystemSpecific1,
+ void *FunctionContext,
+ void *SystemSpecific2, void *SystemSpecific3)
{
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext;
@@ -259,23 +259,23 @@ VOID DisassocTimeout(IN PVOID SystemSpecific1,
==========================================================================
*/
-VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR ApAddr[6];
+ u8 ApAddr[6];
HEADER_802_11 AssocHdr;
- UCHAR WmeIe[9] =
+ u8 WmeIe[9] =
{ IE_VENDOR_SPECIFIC, 0x07, 0x00, 0x50, 0xf2, 0x02, 0x00, 0x01,
0x00 };
- USHORT ListenIntv;
- ULONG Timeout;
- USHORT CapabilityInfo;
+ u16 ListenIntv;
+ unsigned long Timeout;
+ u16 CapabilityInfo;
BOOLEAN TimerCancelled;
- PUCHAR pOutBuffer = NULL;
- NDIS_STATUS NStatus;
- ULONG FrameLen = 0;
- ULONG tmp;
- USHORT VarIesOffset;
- USHORT Status;
+ u8 *pOutBuffer = NULL;
+ int NStatus;
+ unsigned long FrameLen = 0;
+ unsigned long tmp;
+ u16 VarIesOffset;
+ u16 Status;
/* Block all authentication request durning WPA block period */
if (pAd->StaCfg.bBlockAssoc == TRUE) {
@@ -377,9 +377,9 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* HT */
if ((pAd->MlmeAux.HtCapabilityLen > 0)
&& (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) {
- ULONG TmpLen;
- UCHAR HtLen;
- UCHAR BROADCOM[4] = { 0x0, 0x90, 0x4c, 0x33 };
+ unsigned long TmpLen;
+ u8 HtLen;
+ u8 BROADCOM[4] = { 0x0, 0x90, 0x4c, 0x33 };
if (pAd->StaActive.SupportedPhyInfo.bPreNHt == TRUE) {
HtLen = SIZE_HT_CAP_IE + 4;
MakeOutgoingFrame(pOutBuffer + FrameLen,
@@ -409,8 +409,8 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
if (pAd->CommonCfg.bAggregationCapable) {
if ((pAd->CommonCfg.bPiggyBackCapable)
&& ((pAd->MlmeAux.APRalinkIe & 0x00000003) == 3)) {
- ULONG TmpLen;
- UCHAR RalinkIe[9] =
+ unsigned long TmpLen;
+ u8 RalinkIe[9] =
{ IE_VENDOR_SPECIFIC, 7, 0x00, 0x0c, 0x43,
0x03, 0x00, 0x00, 0x00 };
MakeOutgoingFrame(pOutBuffer + FrameLen,
@@ -418,8 +418,8 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
END_OF_ARGS);
FrameLen += TmpLen;
} else if (pAd->MlmeAux.APRalinkIe & 0x00000001) {
- ULONG TmpLen;
- UCHAR RalinkIe[9] =
+ unsigned long TmpLen;
+ u8 RalinkIe[9] =
{ IE_VENDOR_SPECIFIC, 7, 0x00, 0x0c, 0x43,
0x01, 0x00, 0x00, 0x00 };
MakeOutgoingFrame(pOutBuffer + FrameLen,
@@ -428,8 +428,8 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
FrameLen += TmpLen;
}
} else {
- ULONG TmpLen;
- UCHAR RalinkIe[9] =
+ unsigned long TmpLen;
+ u8 RalinkIe[9] =
{ IE_VENDOR_SPECIFIC, 7, 0x00, 0x0c, 0x43, 0x06,
0x00, 0x00, 0x00 };
MakeOutgoingFrame(pOutBuffer + FrameLen, &TmpLen, 9,
@@ -450,7 +450,7 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
QosInfo.UAPSD_AC_VO = pAd->CommonCfg.bAPSDAC_VO;
QosInfo.MaxSPLength =
pAd->CommonCfg.MaxSPLength;
- WmeIe[8] |= *(PUCHAR) & QosInfo;
+ WmeIe[8] |= *(u8 *)& QosInfo;
} else {
/* The Parameter Set Count is set to ¡§0¡¨ in the association request frames */
/* WmeIe[8] |= (pAd->MlmeAux.APEdcaParm.EdcaUpdateCount & 0x0f); */
@@ -472,7 +472,7 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
(pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2)
)
) {
- UCHAR RSNIe = IE_WPA;
+ u8 RSNIe = IE_WPA;
if ((pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2PSK)
|| (pAd->StaCfg.AuthMode ==
@@ -488,7 +488,7 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* Check for WPA PMK cache list */
if (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2) {
- INT idx;
+ int idx;
BOOLEAN FoundPMK = FALSE;
/* Search chched PMKID, append it if existed */
for (idx = 0; idx < PMKID_NO; idx++) {
@@ -502,7 +502,7 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
}
if (FoundPMK) {
/* Set PMK number */
- *(PUSHORT) & pAd->StaCfg.RSN_IE[pAd->
+ *(u16 *)& pAd->StaCfg.RSN_IE[pAd->
StaCfg.
RSNIE_Len]
= 1;
@@ -589,21 +589,21 @@ VOID MlmeAssocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR ApAddr[6];
+ u8 ApAddr[6];
HEADER_802_11 ReassocHdr;
- UCHAR WmeIe[9] =
+ u8 WmeIe[9] =
{ IE_VENDOR_SPECIFIC, 0x07, 0x00, 0x50, 0xf2, 0x02, 0x00, 0x01,
0x00 };
- USHORT CapabilityInfo, ListenIntv;
- ULONG Timeout;
- ULONG FrameLen = 0;
+ u16 CapabilityInfo, ListenIntv;
+ unsigned long Timeout;
+ unsigned long FrameLen = 0;
BOOLEAN TimerCancelled;
- NDIS_STATUS NStatus;
- ULONG tmp;
- PUCHAR pOutBuffer = NULL;
- USHORT Status;
+ int NStatus;
+ unsigned long tmp;
+ u8 *pOutBuffer = NULL;
+ u16 Status;
/* Block all authentication request durning WPA block period */
if (pAd->StaCfg.bBlockAssoc == TRUE) {
@@ -669,7 +669,7 @@ VOID MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
QosInfo.UAPSD_AC_VO = pAd->CommonCfg.bAPSDAC_VO;
QosInfo.MaxSPLength =
pAd->CommonCfg.MaxSPLength;
- WmeIe[8] |= *(PUCHAR) & QosInfo;
+ WmeIe[8] |= *(u8 *)& QosInfo;
}
MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
@@ -679,9 +679,9 @@ VOID MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* HT */
if ((pAd->MlmeAux.HtCapabilityLen > 0)
&& (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) {
- ULONG TmpLen;
- UCHAR HtLen;
- UCHAR BROADCOM[4] = { 0x0, 0x90, 0x4c, 0x33 };
+ unsigned long TmpLen;
+ u8 HtLen;
+ u8 BROADCOM[4] = { 0x0, 0x90, 0x4c, 0x33 };
if (pAd->StaActive.SupportedPhyInfo.bPreNHt == TRUE) {
HtLen = SIZE_HT_CAP_IE + 4;
MakeOutgoingFrame(pOutBuffer + FrameLen,
@@ -711,8 +711,8 @@ VOID MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
if (pAd->CommonCfg.bAggregationCapable) {
if ((pAd->CommonCfg.bPiggyBackCapable)
&& ((pAd->MlmeAux.APRalinkIe & 0x00000003) == 3)) {
- ULONG TmpLen;
- UCHAR RalinkIe[9] =
+ unsigned long TmpLen;
+ u8 RalinkIe[9] =
{ IE_VENDOR_SPECIFIC, 7, 0x00, 0x0c, 0x43,
0x03, 0x00, 0x00, 0x00 };
MakeOutgoingFrame(pOutBuffer + FrameLen,
@@ -720,8 +720,8 @@ VOID MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
END_OF_ARGS);
FrameLen += TmpLen;
} else if (pAd->MlmeAux.APRalinkIe & 0x00000001) {
- ULONG TmpLen;
- UCHAR RalinkIe[9] =
+ unsigned long TmpLen;
+ u8 RalinkIe[9] =
{ IE_VENDOR_SPECIFIC, 7, 0x00, 0x0c, 0x43,
0x01, 0x00, 0x00, 0x00 };
MakeOutgoingFrame(pOutBuffer + FrameLen,
@@ -730,8 +730,8 @@ VOID MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
FrameLen += TmpLen;
}
} else {
- ULONG TmpLen;
- UCHAR RalinkIe[9] =
+ unsigned long TmpLen;
+ u8 RalinkIe[9] =
{ IE_VENDOR_SPECIFIC, 7, 0x00, 0x0c, 0x43, 0x04,
0x00, 0x00, 0x00 };
MakeOutgoingFrame(pOutBuffer + FrameLen, &TmpLen, 9,
@@ -765,17 +765,17 @@ VOID MlmeReassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID MlmeDisassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeDisassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
PMLME_DISASSOC_REQ_STRUCT pDisassocReq;
HEADER_802_11 DisassocHdr;
PHEADER_802_11 pDisassocHdr;
- PUCHAR pOutBuffer = NULL;
- ULONG FrameLen = 0;
- NDIS_STATUS NStatus;
+ u8 *pOutBuffer = NULL;
+ unsigned long FrameLen = 0;
+ int NStatus;
BOOLEAN TimerCancelled;
- ULONG Timeout = 500;
- USHORT Status;
+ unsigned long Timeout = 500;
+ u16 Status;
/* skip sanity check */
pDisassocReq = (PMLME_DISASSOC_REQ_STRUCT) (Elem->Msg);
@@ -835,20 +835,20 @@ VOID MlmeDisassocReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID PeerAssocRspAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerAssocRspAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT CapabilityInfo, Status, Aid;
- UCHAR SupRate[MAX_LEN_OF_SUPPORTED_RATES], SupRateLen;
- UCHAR ExtRate[MAX_LEN_OF_SUPPORTED_RATES], ExtRateLen;
- UCHAR Addr2[MAC_ADDR_LEN];
+ u16 CapabilityInfo, Status, Aid;
+ u8 SupRate[MAX_LEN_OF_SUPPORTED_RATES], SupRateLen;
+ u8 ExtRate[MAX_LEN_OF_SUPPORTED_RATES], ExtRateLen;
+ u8 Addr2[MAC_ADDR_LEN];
BOOLEAN TimerCancelled;
- UCHAR CkipFlag;
+ u8 CkipFlag;
EDCA_PARM EdcaParm;
HT_CAPABILITY_IE HtCapability;
ADD_HT_INFO_IE AddHtInfo; /* AP might use this additional ht info IE */
- UCHAR HtCapabilityLen = 0;
- UCHAR AddHtInfoLen;
- UCHAR NewExtChannelOffset = 0xff;
+ u8 HtCapabilityLen = 0;
+ u8 AddHtInfoLen;
+ u8 NewExtChannelOffset = 0xff;
if (PeerAssocRspSanity
(pAd, Elem->Msg, Elem->MsgLen, Addr2, &CapabilityInfo, &Status,
@@ -870,8 +870,8 @@ VOID PeerAssocRspAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
&TimerCancelled);
if (Status == MLME_SUCCESS) {
- UCHAR MaxSupportedRateIn500Kbps = 0;
- UCHAR idx;
+ u8 MaxSupportedRateIn500Kbps = 0;
+ u8 idx;
/* supported rates array may not be sorted. sort it and find the maximum rate */
for (idx = 0; idx < SupRateLen; idx++) {
@@ -924,22 +924,22 @@ VOID PeerAssocRspAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID PeerReassocRspAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerReassocRspAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT CapabilityInfo;
- USHORT Status;
- USHORT Aid;
- UCHAR SupRate[MAX_LEN_OF_SUPPORTED_RATES], SupRateLen;
- UCHAR ExtRate[MAX_LEN_OF_SUPPORTED_RATES], ExtRateLen;
- UCHAR Addr2[MAC_ADDR_LEN];
- UCHAR CkipFlag;
+ u16 CapabilityInfo;
+ u16 Status;
+ u16 Aid;
+ u8 SupRate[MAX_LEN_OF_SUPPORTED_RATES], SupRateLen;
+ u8 ExtRate[MAX_LEN_OF_SUPPORTED_RATES], ExtRateLen;
+ u8 Addr2[MAC_ADDR_LEN];
+ u8 CkipFlag;
BOOLEAN TimerCancelled;
EDCA_PARM EdcaParm;
HT_CAPABILITY_IE HtCapability;
ADD_HT_INFO_IE AddHtInfo; /* AP might use this additional ht info IE */
- UCHAR HtCapabilityLen;
- UCHAR AddHtInfoLen;
- UCHAR NewExtChannelOffset = 0xff;
+ u8 HtCapabilityLen;
+ u8 AddHtInfoLen;
+ u8 NewExtChannelOffset = 0xff;
if (PeerAssocRspSanity
(pAd, Elem->Msg, Elem->MsgLen, Addr2, &CapabilityInfo, &Status,
@@ -994,9 +994,9 @@ VOID PeerReassocRspAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID AssocPostProc(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr2, IN USHORT CapabilityInfo, IN USHORT Aid, IN UCHAR SupRate[], IN UCHAR SupRateLen, IN UCHAR ExtRate[], IN UCHAR ExtRateLen, IN PEDCA_PARM pEdcaParm, IN HT_CAPABILITY_IE * pHtCapability, IN UCHAR HtCapabilityLen, IN ADD_HT_INFO_IE * pAddHtInfo) /* AP might use this additional ht info IE */
+void AssocPostProc(IN PRTMP_ADAPTER pAd, u8 *pAddr2, u16 CapabilityInfo, u16 Aid, u8 SupRate[], u8 SupRateLen, u8 ExtRate[], u8 ExtRateLen, IN PEDCA_PARM pEdcaParm, IN HT_CAPABILITY_IE * pHtCapability, u8 HtCapabilityLen, IN ADD_HT_INFO_IE * pAddHtInfo) /* AP might use this additional ht info IE */
{
- ULONG Idx;
+ unsigned long Idx;
pAd->MlmeAux.BssType = BSS_INFRA;
COPY_MAC_ADDR(pAd->MlmeAux.Bssid, pAddr2);
@@ -1067,8 +1067,8 @@ VOID AssocPostProc(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr2, IN USHORT CapabilityI
/* Store appropriate RSN_IE for WPA SM negotiation later */
if ((pAd->StaCfg.AuthMode >= Ndis802_11AuthModeWPA)
&& (pAd->ScanTab.BssEntry[Idx].VarIELen != 0)) {
- PUCHAR pVIE;
- USHORT len;
+ u8 *pVIE;
+ u16 len;
PEID_STRUCT pEid;
pVIE = pAd->ScanTab.BssEntry[Idx].VarIEs;
@@ -1144,10 +1144,10 @@ VOID AssocPostProc(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr2, IN USHORT CapabilityI
==========================================================================
*/
-VOID PeerDisassocAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerDisassocAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Addr2[MAC_ADDR_LEN];
- USHORT Reason;
+ u8 Addr2[MAC_ADDR_LEN];
+ u16 Reason;
DBGPRINT(RT_DEBUG_TRACE, ("ASSOC - PeerDisassocAction()\n"));
if (PeerDisassocSanity(pAd, Elem->Msg, Elem->MsgLen, Addr2, &Reason)) {
@@ -1189,9 +1189,9 @@ VOID PeerDisassocAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID AssocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void AssocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE, ("ASSOC - AssocTimeoutAction\n"));
pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
Status = MLME_REJ_TIMEOUT;
@@ -1207,9 +1207,9 @@ VOID AssocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID ReassocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void ReassocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE, ("ASSOC - ReassocTimeoutAction\n"));
pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
Status = MLME_REJ_TIMEOUT;
@@ -1225,9 +1225,9 @@ VOID ReassocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID DisassocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void DisassocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE, ("ASSOC - DisassocTimeoutAction\n"));
pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
Status = MLME_SUCCESS;
@@ -1235,9 +1235,9 @@ VOID DisassocTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
&Status);
}
-VOID InvalidStateWhenAssoc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void InvalidStateWhenAssoc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE,
("ASSOC - InvalidStateWhenAssoc(state=%ld), reset ASSOC state machine\n",
pAd->Mlme.AssocMachine.CurrState));
@@ -1246,9 +1246,9 @@ VOID InvalidStateWhenAssoc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_ASSOC_CONF, 2, &Status);
}
-VOID InvalidStateWhenReassoc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void InvalidStateWhenReassoc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE,
("ASSOC - InvalidStateWhenReassoc(state=%ld), reset ASSOC state machine\n",
pAd->Mlme.AssocMachine.CurrState));
@@ -1257,10 +1257,10 @@ VOID InvalidStateWhenReassoc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_REASSOC_CONF, 2, &Status);
}
-VOID InvalidStateWhenDisassociate(IN PRTMP_ADAPTER pAd,
+void InvalidStateWhenDisassociate(IN PRTMP_ADAPTER pAd,
IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE,
("ASSOC - InvalidStateWhenDisassoc(state=%ld), reset ASSOC state machine\n",
pAd->Mlme.AssocMachine.CurrState));
@@ -1283,14 +1283,14 @@ VOID InvalidStateWhenDisassociate(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID Cls3errAction(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr)
+void Cls3errAction(IN PRTMP_ADAPTER pAd, u8 *pAddr)
{
HEADER_802_11 DisassocHdr;
PHEADER_802_11 pDisassocHdr;
- PUCHAR pOutBuffer = NULL;
- ULONG FrameLen = 0;
- NDIS_STATUS NStatus;
- USHORT Reason = REASON_CLS3ERR;
+ u8 *pOutBuffer = NULL;
+ unsigned long FrameLen = 0;
+ int NStatus;
+ u16 Reason = REASON_CLS3ERR;
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); /*Get an unused nonpaged memory */
if (NStatus != NDIS_STATUS_SUCCESS)
@@ -1336,13 +1336,13 @@ int wext_notify_event_assoc(IN RTMP_ADAPTER * pAd)
BOOLEAN StaAddMacTableEntry(IN PRTMP_ADAPTER pAd,
IN PMAC_TABLE_ENTRY pEntry,
- IN UCHAR MaxSupportedRateIn500Kbps,
+ u8 MaxSupportedRateIn500Kbps,
IN HT_CAPABILITY_IE * pHtCapability,
- IN UCHAR HtCapabilityLen,
+ u8 HtCapabilityLen,
IN ADD_HT_INFO_IE * pAddHtInfo,
- IN UCHAR AddHtInfoLen, IN USHORT CapabilityInfo)
+ u8 AddHtInfoLen, u16 CapabilityInfo)
{
- UCHAR MaxSupportedRate = RATE_11;
+ u8 MaxSupportedRate = RATE_11;
if (ADHOC_ON(pAd))
CLIENT_STATUS_CLEAR_FLAG(pEntry, fCLIENT_STATUS_WMM_CAPABLE);
@@ -1448,8 +1448,8 @@ BOOLEAN StaAddMacTableEntry(IN PRTMP_ADAPTER pAd,
/* If this Entry supports 802.11n, upgrade to HT rate. */
if ((HtCapabilityLen != 0)
&& (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) {
- UCHAR j, bitmask; /*k,bitmask; */
- CHAR i;
+ u8 j, bitmask; /*k,bitmask; */
+ char i;
if (ADHOC_ON(pAd))
CLIENT_STATUS_SET_FLAG(pEntry,
@@ -1526,8 +1526,8 @@ BOOLEAN StaAddMacTableEntry(IN PRTMP_ADAPTER pAd,
pEntry->MpduDensity = pHtCapability->HtCapParm.MpduDensity;
pEntry->MaxRAmpduFactor =
pHtCapability->HtCapParm.MaxRAmpduFactor;
- pEntry->MmpsMode = (UCHAR) pHtCapability->HtCapInfo.MimoPs;
- pEntry->AMsduSize = (UCHAR) pHtCapability->HtCapInfo.AMsduSize;
+ pEntry->MmpsMode = (u8)pHtCapability->HtCapInfo.MimoPs;
+ pEntry->AMsduSize = (u8)pHtCapability->HtCapInfo.AMsduSize;
pEntry->HTPhyMode.word = pEntry->MaxHTPhyMode.word;
if (pAd->CommonCfg.DesiredHtPhy.AmsduEnable
@@ -1567,8 +1567,8 @@ BOOLEAN StaAddMacTableEntry(IN PRTMP_ADAPTER pAd,
/* Set asic auto fall back */
if (pAd->StaCfg.bAutoTxRateSwitch == TRUE) {
- PUCHAR pTable;
- UCHAR TableSize = 0;
+ u8 *pTable;
+ u8 TableSize = 0;
MlmeSelectTxRateTable(pAd, pEntry, &pTable, &TableSize,
&pEntry->CurrTxRateIndex);
@@ -1579,7 +1579,7 @@ BOOLEAN StaAddMacTableEntry(IN PRTMP_ADAPTER pAd,
pEntry->bAutoTxRateSwitch = FALSE;
/* If the legacy mode is set, overwrite the transmit setting of this entry. */
- RTMPUpdateLegacyTxSetting((UCHAR) pAd->StaCfg.
+ RTMPUpdateLegacyTxSetting((u8)pAd->StaCfg.
DesiredTransmitSetting.field.
FixedTxMode, pEntry);
}
diff --git a/drivers/staging/rt2860/sta/auth.c b/drivers/staging/rt2860/sta/auth.c
index a69b6a7f03e2..ddb357ac041c 100644
--- a/drivers/staging/rt2860/sta/auth.c
+++ b/drivers/staging/rt2860/sta/auth.c
@@ -95,9 +95,9 @@ void AuthStateMachineInit(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID AuthTimeout(IN PVOID SystemSpecific1,
- IN PVOID FunctionContext,
- IN PVOID SystemSpecific2, IN PVOID SystemSpecific3)
+void AuthTimeout(void *SystemSpecific1,
+ void *FunctionContext,
+ void *SystemSpecific2, void *SystemSpecific3)
{
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext;
@@ -125,13 +125,13 @@ VOID AuthTimeout(IN PVOID SystemSpecific1,
==========================================================================
*/
-VOID MlmeAuthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeAuthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
if (AUTH_ReqSend
(pAd, Elem, &pAd->MlmeAux.AuthTimer, "AUTH", 1, NULL, 0))
pAd->Mlme.AuthMachine.CurrState = AUTH_WAIT_SEQ2;
else {
- USHORT Status;
+ u16 Status;
pAd->Mlme.AuthMachine.CurrState = AUTH_REQ_IDLE;
Status = MLME_INVALID_FORMAT;
@@ -148,23 +148,23 @@ VOID MlmeAuthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Addr2[MAC_ADDR_LEN];
- USHORT Seq, Status, RemoteStatus, Alg;
- UCHAR ChlgText[CIPHER_TEXT_LEN];
- UCHAR CyperChlgText[CIPHER_TEXT_LEN + 8 + 8];
- UCHAR Element[2];
+ u8 Addr2[MAC_ADDR_LEN];
+ u16 Seq, Status, RemoteStatus, Alg;
+ u8 ChlgText[CIPHER_TEXT_LEN];
+ u8 CyperChlgText[CIPHER_TEXT_LEN + 8 + 8];
+ u8 Element[2];
HEADER_802_11 AuthHdr;
BOOLEAN TimerCancelled;
- PUCHAR pOutBuffer = NULL;
- NDIS_STATUS NStatus;
- ULONG FrameLen = 0;
- USHORT Status2;
+ u8 *pOutBuffer = NULL;
+ int NStatus;
+ unsigned long FrameLen = 0;
+ u16 Status2;
if (PeerAuthSanity
(pAd, Elem->Msg, Elem->MsgLen, Addr2, &Alg, &Seq, &Status,
- (PCHAR) ChlgText)) {
+ (char *)ChlgText)) {
if (MAC_ADDR_EQUAL(pAd->MlmeAux.Bssid, Addr2) && Seq == 2) {
DBGPRINT(RT_DEBUG_TRACE,
("AUTH - Receive AUTH_RSP seq#2 to me (Alg=%d, Status=%d)\n",
@@ -224,18 +224,18 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
KeyLen,
CyperChlgText);
- Alg = cpu2le16(*(USHORT *) & Alg);
- Seq = cpu2le16(*(USHORT *) & Seq);
+ Alg = cpu2le16(*(u16 *) & Alg);
+ Seq = cpu2le16(*(u16 *) & Seq);
RemoteStatus =
- cpu2le16(*(USHORT *) &
+ cpu2le16(*(u16 *) &
RemoteStatus);
- RTMPEncryptData(pAd, (PUCHAR) & Alg,
+ RTMPEncryptData(pAd, (u8 *)& Alg,
CyperChlgText + 4, 2);
- RTMPEncryptData(pAd, (PUCHAR) & Seq,
+ RTMPEncryptData(pAd, (u8 *)& Seq,
CyperChlgText + 6, 2);
RTMPEncryptData(pAd,
- (PUCHAR) & RemoteStatus,
+ (u8 *)& RemoteStatus,
CyperChlgText + 8, 2);
Element[0] = 16;
Element[1] = 128;
@@ -282,11 +282,11 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID PeerAuthRspAtSeq4Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerAuthRspAtSeq4Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Addr2[MAC_ADDR_LEN];
- USHORT Alg, Seq, Status;
- CHAR ChlgText[CIPHER_TEXT_LEN];
+ u8 Addr2[MAC_ADDR_LEN];
+ u16 Alg, Seq, Status;
+ char ChlgText[CIPHER_TEXT_LEN];
BOOLEAN TimerCancelled;
if (PeerAuthSanity
@@ -321,14 +321,14 @@ VOID PeerAuthRspAtSeq4Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID MlmeDeauthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeDeauthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
MLME_DEAUTH_REQ_STRUCT *pInfo;
HEADER_802_11 DeauthHdr;
- PUCHAR pOutBuffer = NULL;
- NDIS_STATUS NStatus;
- ULONG FrameLen = 0;
- USHORT Status;
+ u8 *pOutBuffer = NULL;
+ int NStatus;
+ unsigned long FrameLen = 0;
+ u16 Status;
pInfo = (MLME_DEAUTH_REQ_STRUCT *) Elem->Msg;
@@ -374,9 +374,9 @@ VOID MlmeDeauthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID AuthTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void AuthTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE, ("AUTH - AuthTimeoutAction\n"));
pAd->Mlme.AuthMachine.CurrState = AUTH_REQ_IDLE;
Status = MLME_REJ_TIMEOUT;
@@ -391,9 +391,9 @@ VOID AuthTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID InvalidStateWhenAuth(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void InvalidStateWhenAuth(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE,
("AUTH - InvalidStateWhenAuth (state=%ld), reset AUTH state machine\n",
pAd->Mlme.AuthMachine.CurrState));
@@ -414,13 +414,13 @@ VOID InvalidStateWhenAuth(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID Cls2errAction(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr)
+void Cls2errAction(IN PRTMP_ADAPTER pAd, u8 *pAddr)
{
HEADER_802_11 DeauthHdr;
- PUCHAR pOutBuffer = NULL;
- NDIS_STATUS NStatus;
- ULONG FrameLen = 0;
- USHORT Reason = REASON_CLS2ERR;
+ u8 *pOutBuffer = NULL;
+ int NStatus;
+ unsigned long FrameLen = 0;
+ u16 Reason = REASON_CLS2ERR;
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); /*Get an unused nonpaged memory */
if (NStatus != NDIS_STATUS_SUCCESS)
@@ -442,18 +442,18 @@ VOID Cls2errAction(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr)
BOOLEAN AUTH_ReqSend(IN PRTMP_ADAPTER pAd,
IN PMLME_QUEUE_ELEM pElem,
IN PRALINK_TIMER_STRUCT pAuthTimer,
- IN PSTRING pSMName,
- IN USHORT SeqNo,
- IN PUCHAR pNewElement, IN ULONG ElementLen)
+ char *pSMName,
+ u16 SeqNo,
+ u8 *pNewElement, unsigned long ElementLen)
{
- USHORT Alg, Seq, Status;
- UCHAR Addr[6];
- ULONG Timeout;
+ u16 Alg, Seq, Status;
+ u8 Addr[6];
+ unsigned long Timeout;
HEADER_802_11 AuthHdr;
BOOLEAN TimerCancelled;
- NDIS_STATUS NStatus;
- PUCHAR pOutBuffer = NULL;
- ULONG FrameLen = 0, tmp = 0;
+ int NStatus;
+ u8 *pOutBuffer = NULL;
+ unsigned long FrameLen = 0, tmp = 0;
/* Block all authentication request durning WPA block period */
if (pAd->StaCfg.bBlockAssoc == TRUE) {
diff --git a/drivers/staging/rt2860/sta/auth_rsp.c b/drivers/staging/rt2860/sta/auth_rsp.c
index e3c07a466ed1..d155dc6cdf1d 100644
--- a/drivers/staging/rt2860/sta/auth_rsp.c
+++ b/drivers/staging/rt2860/sta/auth_rsp.c
@@ -47,7 +47,7 @@
==========================================================================
*/
-VOID AuthRspStateMachineInit(IN PRTMP_ADAPTER pAd,
+void AuthRspStateMachineInit(IN PRTMP_ADAPTER pAd,
IN PSTATE_MACHINE Sm,
IN STATE_MACHINE_FUNC Trans[])
{
@@ -73,16 +73,16 @@ VOID AuthRspStateMachineInit(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID PeerAuthSimpleRspGenAndSend(IN PRTMP_ADAPTER pAd,
+void PeerAuthSimpleRspGenAndSend(IN PRTMP_ADAPTER pAd,
IN PHEADER_802_11 pHdr80211,
- IN USHORT Alg,
- IN USHORT Seq,
- IN USHORT Reason, IN USHORT Status)
+ u16 Alg,
+ u16 Seq,
+ u16 Reason, u16 Status)
{
HEADER_802_11 AuthHdr;
- ULONG FrameLen = 0;
- PUCHAR pOutBuffer = NULL;
- NDIS_STATUS NStatus;
+ unsigned long FrameLen = 0;
+ u8 *pOutBuffer = NULL;
+ int NStatus;
if (Reason != MLME_SUCCESS) {
DBGPRINT(RT_DEBUG_TRACE, ("Peer AUTH fail...\n"));
@@ -110,10 +110,10 @@ VOID PeerAuthSimpleRspGenAndSend(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID PeerDeauthAction(IN PRTMP_ADAPTER pAd, IN PMLME_QUEUE_ELEM Elem)
+void PeerDeauthAction(IN PRTMP_ADAPTER pAd, IN PMLME_QUEUE_ELEM Elem)
{
- UCHAR Addr2[MAC_ADDR_LEN];
- USHORT Reason;
+ u8 Addr2[MAC_ADDR_LEN];
+ u16 Reason;
if (PeerDeauthSanity(pAd, Elem->Msg, Elem->MsgLen, Addr2, &Reason)) {
if (INFRA_ON(pAd)
diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c
index 29906be51e58..c11389f89789 100644
--- a/drivers/staging/rt2860/sta/connect.c
+++ b/drivers/staging/rt2860/sta/connect.c
@@ -36,7 +36,7 @@
*/
#include "../rt_config.h"
-UCHAR CipherSuiteWpaNoneTkip[] = {
+u8 CipherSuiteWpaNoneTkip[] = {
0x00, 0x50, 0xf2, 0x01, /* oui */
0x01, 0x00, /* Version */
0x00, 0x50, 0xf2, 0x02, /* Multicast */
@@ -46,10 +46,10 @@ UCHAR CipherSuiteWpaNoneTkip[] = {
0x00, 0x50, 0xf2, 0x00 /* authentication */
};
-UCHAR CipherSuiteWpaNoneTkipLen =
- (sizeof(CipherSuiteWpaNoneTkip) / sizeof(UCHAR));
+u8 CipherSuiteWpaNoneTkipLen =
+ (sizeof(CipherSuiteWpaNoneTkip) / sizeof(u8));
-UCHAR CipherSuiteWpaNoneAes[] = {
+u8 CipherSuiteWpaNoneAes[] = {
0x00, 0x50, 0xf2, 0x01, /* oui */
0x01, 0x00, /* Version */
0x00, 0x50, 0xf2, 0x04, /* Multicast */
@@ -59,8 +59,8 @@ UCHAR CipherSuiteWpaNoneAes[] = {
0x00, 0x50, 0xf2, 0x00 /* authentication */
};
-UCHAR CipherSuiteWpaNoneAesLen =
- (sizeof(CipherSuiteWpaNoneAes) / sizeof(UCHAR));
+u8 CipherSuiteWpaNoneAesLen =
+ (sizeof(CipherSuiteWpaNoneAes) / sizeof(u8));
/* The following MACRO is called after 1. starting an new IBSS, 2. succesfully JOIN an IBSS, */
/* or 3. succesfully ASSOCIATE to a BSS, 4. successfully RE_ASSOCIATE to a BSS */
@@ -102,7 +102,7 @@ UCHAR CipherSuiteWpaNoneAesLen =
==========================================================================
*/
-VOID MlmeCntlInit(IN PRTMP_ADAPTER pAd,
+void MlmeCntlInit(IN PRTMP_ADAPTER pAd,
IN STATE_MACHINE * S, OUT STATE_MACHINE_FUNC Trans[])
{
/* Control state machine differs from other state machines, the interface */
@@ -118,7 +118,7 @@ VOID MlmeCntlInit(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID MlmeCntlMachinePerformAction(IN PRTMP_ADAPTER pAd,
+void MlmeCntlMachinePerformAction(IN PRTMP_ADAPTER pAd,
IN STATE_MACHINE * S,
IN MLME_QUEUE_ELEM * Elem)
{
@@ -204,7 +204,7 @@ VOID MlmeCntlMachinePerformAction(IN PRTMP_ADAPTER pAd,
/* Check if we can connect to. */
/* */
BssTableSsidSort(pAd, &pAd->MlmeAux.SsidBssTab,
- (CHAR *) pAd->MlmeAux.
+ (char *) pAd->MlmeAux.
AutoReconnectSsid,
pAd->MlmeAux.AutoReconnectSsidLen);
if (pAd->MlmeAux.SsidBssTab.BssNr > 0) {
@@ -228,7 +228,7 @@ VOID MlmeCntlMachinePerformAction(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID CntlIdleProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlIdleProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
MLME_DISASSOC_REQ_STRUCT DisassocReq;
@@ -281,10 +281,10 @@ VOID CntlIdleProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
}
}
-VOID CntlOidScanProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlOidScanProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
MLME_SCAN_REQ_STRUCT ScanReq;
- ULONG BssIdx = BSS_NOT_FOUND;
+ unsigned long BssIdx = BSS_NOT_FOUND;
BSS_ENTRY CurrBss;
/* record current BSS if network is connected. */
@@ -292,7 +292,7 @@ VOID CntlOidScanProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED)) {
BssIdx =
BssSsidTableSearch(&pAd->ScanTab, pAd->CommonCfg.Bssid,
- (PUCHAR) pAd->CommonCfg.Ssid,
+ (u8 *)pAd->CommonCfg.Ssid,
pAd->CommonCfg.SsidLen,
pAd->CommonCfg.Channel);
if (BssIdx != BSS_NOT_FOUND) {
@@ -313,7 +313,7 @@ VOID CntlOidScanProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
pAd->ScanTab.BssNr = 1;
}
- ScanParmFill(pAd, &ScanReq, (PSTRING) Elem->Msg, Elem->MsgLen, BSS_ANY,
+ ScanParmFill(pAd, &ScanReq, (char *)Elem->Msg, Elem->MsgLen, BSS_ANY,
SCAN_ACTIVE);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_SCAN_REQ,
sizeof(MLME_SCAN_REQ_STRUCT), &ScanReq);
@@ -329,16 +329,16 @@ VOID CntlOidScanProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlOidSsidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlOidSsidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
PNDIS_802_11_SSID pOidSsid = (NDIS_802_11_SSID *) Elem->Msg;
MLME_DISASSOC_REQ_STRUCT DisassocReq;
- ULONG Now;
+ unsigned long Now;
/* Step 1. record the desired user settings to MlmeAux */
NdisZeroMemory(pAd->MlmeAux.Ssid, MAX_LEN_OF_SSID);
NdisMoveMemory(pAd->MlmeAux.Ssid, pOidSsid->Ssid, pOidSsid->SsidLength);
- pAd->MlmeAux.SsidLen = (UCHAR) pOidSsid->SsidLength;
+ pAd->MlmeAux.SsidLen = (u8)pOidSsid->SsidLength;
NdisZeroMemory(pAd->MlmeAux.Bssid, MAC_ADDR_LEN);
pAd->MlmeAux.BssType = pAd->StaCfg.BssType;
@@ -355,7 +355,7 @@ VOID CntlOidSsidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* step 2. find all matching BSS in the lastest SCAN result (inBssTab) */
/* & log them into MlmeAux.SsidBssTab for later-on iteration. Sort by RSSI order */
BssTableSsidSort(pAd, &pAd->MlmeAux.SsidBssTab,
- (PCHAR) pAd->MlmeAux.Ssid, pAd->MlmeAux.SsidLen);
+ (char *)pAd->MlmeAux.Ssid, pAd->MlmeAux.SsidLen);
DBGPRINT(RT_DEBUG_TRACE,
("CntlOidSsidProc():CNTL - %d BSS of %d BSS match the desire (%d)SSID - %s\n",
@@ -481,7 +481,7 @@ VOID CntlOidSsidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
DBGPRINT(RT_DEBUG_TRACE,
("CntlOidSsidProc():CNTL - No matching BSS, start a new scan\n"));
- ScanParmFill(pAd, &ScanReq, (PSTRING) pAd->MlmeAux.Ssid,
+ ScanParmFill(pAd, &ScanReq, (char *)pAd->MlmeAux.Ssid,
pAd->MlmeAux.SsidLen, BSS_ANY,
SCAN_ACTIVE);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_SCAN_REQ,
@@ -505,10 +505,10 @@ VOID CntlOidSsidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlOidRTBssidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlOidRTBssidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- ULONG BssIdx;
- PUCHAR pOidBssid = (PUCHAR) Elem->Msg;
+ unsigned long BssIdx;
+ u8 *pOidBssid = (u8 *)Elem->Msg;
MLME_DISASSOC_REQ_STRUCT DisassocReq;
MLME_JOIN_REQ_STRUCT JoinReq;
@@ -527,7 +527,7 @@ VOID CntlOidRTBssidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
DBGPRINT(RT_DEBUG_TRACE,
("CNTL - BSSID not found. start a new scan\n"));
- ScanParmFill(pAd, &ScanReq, (PSTRING) pAd->MlmeAux.Ssid,
+ ScanParmFill(pAd, &ScanReq, (char *)pAd->MlmeAux.Ssid,
pAd->MlmeAux.SsidLen, BSS_ANY, SCAN_ACTIVE);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_SCAN_REQ,
sizeof(MLME_SCAN_REQ_STRUCT), &ScanReq);
@@ -675,9 +675,9 @@ VOID CntlOidRTBssidProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* or been corrupted by other "SET OID"? */
/* */
/* IRQL = DISPATCH_LEVEL */
-VOID CntlMlmeRoamingProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlMlmeRoamingProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR BBPValue = 0;
+ u8 BBPValue = 0;
DBGPRINT(RT_DEBUG_TRACE, ("CNTL - Roaming in MlmeAux.RoamTab...\n"));
@@ -705,7 +705,7 @@ VOID CntlMlmeRoamingProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlWaitDisassocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlWaitDisassocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
MLME_START_REQ_STRUCT StartReq;
@@ -726,7 +726,7 @@ VOID CntlWaitDisassocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
DBGPRINT(RT_DEBUG_TRACE,
("CNTL - No matching BSS, start a new ADHOC (Ssid=%s)...\n",
pAd->MlmeAux.Ssid));
- StartParmFill(pAd, &StartReq, (PCHAR) pAd->MlmeAux.Ssid,
+ StartParmFill(pAd, &StartReq, (char *)pAd->MlmeAux.Ssid,
pAd->MlmeAux.SsidLen);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_START_REQ,
sizeof(MLME_START_REQ_STRUCT), &StartReq);
@@ -749,13 +749,13 @@ VOID CntlWaitDisassocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlWaitJoinProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlWaitJoinProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Reason;
+ u16 Reason;
MLME_AUTH_REQ_STRUCT AuthReq;
if (Elem->MsgType == MT2_JOIN_CONF) {
- NdisMoveMemory(&Reason, Elem->Msg, sizeof(USHORT));
+ NdisMoveMemory(&Reason, Elem->Msg, sizeof(u16));
if (Reason == MLME_SUCCESS) {
/* 1. joined an IBSS, we are pretty much done here */
if (pAd->MlmeAux.BssType == BSS_ADHOC) {
@@ -832,12 +832,12 @@ VOID CntlWaitJoinProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlWaitStartProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlWaitStartProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Result;
+ u16 Result;
if (Elem->MsgType == MT2_START_CONF) {
- NdisMoveMemory(&Result, Elem->Msg, sizeof(USHORT));
+ NdisMoveMemory(&Result, Elem->Msg, sizeof(u16));
if (Result == MLME_SUCCESS) {
/* */
/* 5G bands rules of Japan: */
@@ -925,14 +925,14 @@ VOID CntlWaitStartProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlWaitAuthProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlWaitAuthProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Reason;
+ u16 Reason;
MLME_ASSOC_REQ_STRUCT AssocReq;
MLME_AUTH_REQ_STRUCT AuthReq;
if (Elem->MsgType == MT2_AUTH_CONF) {
- NdisMoveMemory(&Reason, Elem->Msg, sizeof(USHORT));
+ NdisMoveMemory(&Reason, Elem->Msg, sizeof(u16));
if (Reason == MLME_SUCCESS) {
DBGPRINT(RT_DEBUG_TRACE, ("CNTL - AUTH OK\n"));
AssocParmFill(pAd, &AssocReq, pAd->MlmeAux.Bssid,
@@ -989,14 +989,14 @@ VOID CntlWaitAuthProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlWaitAuthProc2(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlWaitAuthProc2(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Reason;
+ u16 Reason;
MLME_ASSOC_REQ_STRUCT AssocReq;
MLME_AUTH_REQ_STRUCT AuthReq;
if (Elem->MsgType == MT2_AUTH_CONF) {
- NdisMoveMemory(&Reason, Elem->Msg, sizeof(USHORT));
+ NdisMoveMemory(&Reason, Elem->Msg, sizeof(u16));
if (Reason == MLME_SUCCESS) {
DBGPRINT(RT_DEBUG_TRACE, ("CNTL - AUTH OK\n"));
AssocParmFill(pAd, &AssocReq, pAd->MlmeAux.Bssid,
@@ -1047,12 +1047,12 @@ VOID CntlWaitAuthProc2(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlWaitAssocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlWaitAssocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Reason;
+ u16 Reason;
if (Elem->MsgType == MT2_ASSOC_CONF) {
- NdisMoveMemory(&Reason, Elem->Msg, sizeof(USHORT));
+ NdisMoveMemory(&Reason, Elem->Msg, sizeof(u16));
if (Reason == MLME_SUCCESS) {
if (pAd->CommonCfg.bWirelessEvent) {
RTMPSendWirelessEvent(pAd, IW_ASSOC_EVENT_FLAG,
@@ -1085,12 +1085,12 @@ VOID CntlWaitAssocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID CntlWaitReassocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void CntlWaitReassocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Result;
+ u16 Result;
if (Elem->MsgType == MT2_REASSOC_CONF) {
- NdisMoveMemory(&Result, Elem->Msg, sizeof(USHORT));
+ NdisMoveMemory(&Result, Elem->Msg, sizeof(u16));
if (Result == MLME_SUCCESS) {
/* send wireless event - for association */
if (pAd->CommonCfg.bWirelessEvent)
@@ -1121,7 +1121,7 @@ VOID CntlWaitReassocProc(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
}
}
-VOID AdhocTurnOnQos(IN PRTMP_ADAPTER pAd)
+void AdhocTurnOnQos(IN PRTMP_ADAPTER pAd)
{
#define AC0_DEF_TXOP 0
#define AC1_DEF_TXOP 0
@@ -1162,12 +1162,12 @@ VOID AdhocTurnOnQos(IN PRTMP_ADAPTER pAd)
==========================================================================
*/
-VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
+void LinkUp(IN PRTMP_ADAPTER pAd, u8 BssType)
{
- ULONG Now;
- UINT32 Data;
+ unsigned long Now;
+ u32 Data;
BOOLEAN Cancelled;
- UCHAR Value = 0, idx = 0, HashIdx = 0;
+ u8 Value = 0, idx = 0, HashIdx = 0;
MAC_TABLE_ENTRY *pEntry = NULL, *pCurrEntry = NULL;
/* Init ChannelQuality to prevent DEAD_CQI at initial LinkUp */
@@ -1408,8 +1408,8 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
/* Fill in Shared Key Table(offset: 0x6c00) and Shared Key Mode(offset: 0x7000) */
if (pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled) {
- PUCHAR Key;
- UCHAR CipherAlg;
+ u8 *Key;
+ u8 CipherAlg;
for (idx = 0; idx < SHARE_KEY_NUM; idx++) {
CipherAlg = pAd->SharedKey[BSS0][idx].CipherAlg;
@@ -1511,7 +1511,7 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
/* Key will be set after 4-way handshake. */
/* */
if (pAd->StaCfg.AuthMode >= Ndis802_11AuthModeWPA) {
- ULONG IV;
+ unsigned long IV;
/* Remove all WPA keys */
RTMP_CLEAR_PSFLAG(pAd, fRTMP_PS_CAN_GO_SLEEP);
@@ -1548,8 +1548,8 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
(pAd->StaCfg.PortSecured == WPA_802_1X_PORT_SECURED)) ||
((pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE) &&
(pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled))) {
- PUCHAR Key;
- UCHAR CipherAlg;
+ u8 *Key;
+ u8 CipherAlg;
for (idx = 0; idx < SHARE_KEY_NUM; idx++) {
CipherAlg = pAd->SharedKey[BSS0][idx].CipherAlg;
@@ -1697,8 +1697,8 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
/* Set asic auto fall back */
{
- PUCHAR pTable;
- UCHAR TableSize = 0;
+ u8 *pTable;
+ u8 TableSize = 0;
MlmeSelectTxRateTable(pAd, &pAd->MacTab.Content[BSSID_WCID],
&pTable, &TableSize,
@@ -1721,7 +1721,7 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
/* If the legacy mode is set, overwrite the transmit setting of this entry. */
if (pEntry->HTPhyMode.field.MODE <= MODE_OFDM)
- RTMPUpdateLegacyTxSetting((UCHAR) pAd->StaCfg.
+ RTMPUpdateLegacyTxSetting((u8)pAd->StaCfg.
DesiredTransmitSetting.field.
FixedTxMode, pEntry);
} else
@@ -1729,7 +1729,7 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
NdisReleaseSpinLock(&pAd->MacTabLock);
/* Let Link Status Page display first initial rate. */
- pAd->LastTxRate = (USHORT) (pEntry->HTPhyMode.word);
+ pAd->LastTxRate = (u16)(pEntry->HTPhyMode.word);
/* Select DAC according to HT or Legacy */
if (pAd->StaActive.SupportedPhyInfo.MCSSet[0] != 0x00) {
RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R1, &Value);
@@ -1796,7 +1796,7 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
&& ((STA_WEP_ON(pAd)) || (STA_TKIP_ON(pAd)))) {
pAd->CommonCfg.IOTestParm.bNextDisableRxBA = TRUE;
if (pAd->CommonCfg.bEnableTxBurst) {
- UINT32 MACValue = 0;
+ u32 MACValue = 0;
/* Force disable TXOP value in this case. The same action in MLMEUpdateProtect too. */
/* I didn't change PBF_MAX_PCNT setting. */
RTMP_IO_READ32(pAd, EDCA_AC0_CFG, &MACValue);
@@ -1873,9 +1873,9 @@ VOID LinkUp(IN PRTMP_ADAPTER pAd, IN UCHAR BssType)
==========================================================================
*/
-VOID LinkDown(IN PRTMP_ADAPTER pAd, IN BOOLEAN IsReqFromAP)
+void LinkDown(IN PRTMP_ADAPTER pAd, IN BOOLEAN IsReqFromAP)
{
- UCHAR i, ByteValue = 0;
+ u8 i, ByteValue = 0;
/* Do nothing if monitor mode is on */
if (MONITOR_ON(pAd))
@@ -2122,11 +2122,11 @@ VOID LinkDown(IN PRTMP_ADAPTER pAd, IN BOOLEAN IsReqFromAP)
==========================================================================
*/
-VOID IterateOnBssTab(IN PRTMP_ADAPTER pAd)
+void IterateOnBssTab(IN PRTMP_ADAPTER pAd)
{
MLME_START_REQ_STRUCT StartReq;
MLME_JOIN_REQ_STRUCT JoinReq;
- ULONG BssIdx;
+ unsigned long BssIdx;
/* Change the wepstatus to original wepstatus */
pAd->StaCfg.WepStatus = pAd->StaCfg.OrigWepStatus;
@@ -2206,7 +2206,7 @@ VOID IterateOnBssTab(IN PRTMP_ADAPTER pAd)
DBGPRINT(RT_DEBUG_TRACE,
("CNTL - All BSS fail; start a new ADHOC (Ssid=%s)...\n",
pAd->MlmeAux.Ssid));
- StartParmFill(pAd, &StartReq, (PCHAR) pAd->MlmeAux.Ssid,
+ StartParmFill(pAd, &StartReq, (char *)pAd->MlmeAux.Ssid,
pAd->MlmeAux.SsidLen);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_START_REQ,
sizeof(MLME_START_REQ_STRUCT), &StartReq);
@@ -2228,10 +2228,10 @@ VOID IterateOnBssTab(IN PRTMP_ADAPTER pAd)
/* for re-association only */
/* IRQL = DISPATCH_LEVEL */
-VOID IterateOnBssTab2(IN PRTMP_ADAPTER pAd)
+void IterateOnBssTab2(IN PRTMP_ADAPTER pAd)
{
MLME_REASSOC_REQ_STRUCT ReassocReq;
- ULONG BssIdx;
+ unsigned long BssIdx;
BSS_ENTRY *pBss;
BssIdx = pAd->MlmeAux.RoamIdx;
@@ -2276,8 +2276,8 @@ VOID IterateOnBssTab2(IN PRTMP_ADAPTER pAd)
==========================================================================
*/
-VOID JoinParmFill(IN PRTMP_ADAPTER pAd,
- IN OUT MLME_JOIN_REQ_STRUCT * JoinReq, IN ULONG BssIdx)
+void JoinParmFill(IN PRTMP_ADAPTER pAd,
+ IN OUT MLME_JOIN_REQ_STRUCT * JoinReq, unsigned long BssIdx)
{
JoinReq->BssIdx = BssIdx;
}
@@ -2290,10 +2290,10 @@ VOID JoinParmFill(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID ScanParmFill(IN PRTMP_ADAPTER pAd,
+void ScanParmFill(IN PRTMP_ADAPTER pAd,
IN OUT MLME_SCAN_REQ_STRUCT * ScanReq,
- IN STRING Ssid[],
- IN UCHAR SsidLen, IN UCHAR BssType, IN UCHAR ScanType)
+ char Ssid[],
+ u8 SsidLen, u8 BssType, u8 ScanType)
{
NdisZeroMemory(ScanReq->Ssid, MAX_LEN_OF_SSID);
ScanReq->SsidLen = SsidLen;
@@ -2310,9 +2310,9 @@ VOID ScanParmFill(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID StartParmFill(IN PRTMP_ADAPTER pAd,
+void StartParmFill(IN PRTMP_ADAPTER pAd,
IN OUT MLME_START_REQ_STRUCT * StartReq,
- IN CHAR Ssid[], IN UCHAR SsidLen)
+ char Ssid[], u8 SsidLen)
{
ASSERT(SsidLen <= MAX_LEN_OF_SSID);
NdisMoveMemory(StartReq->Ssid, Ssid, SsidLen);
@@ -2327,9 +2327,9 @@ VOID StartParmFill(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID AuthParmFill(IN PRTMP_ADAPTER pAd,
+void AuthParmFill(IN PRTMP_ADAPTER pAd,
IN OUT MLME_AUTH_REQ_STRUCT * AuthReq,
- IN PUCHAR pAddr, IN USHORT Alg)
+ u8 *pAddr, u16 Alg)
{
COPY_MAC_ADDR(AuthReq->Addr, pAddr);
AuthReq->Alg = Alg;
@@ -2345,7 +2345,7 @@ VOID AuthParmFill(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
#ifdef RTMP_MAC_PCI
-VOID ComposePsPoll(IN PRTMP_ADAPTER pAd)
+void ComposePsPoll(IN PRTMP_ADAPTER pAd)
{
NdisZeroMemory(&pAd->PsPollFrame, sizeof(PSPOLL_FRAME));
pAd->PsPollFrame.FC.Type = BTYPE_CNTL;
@@ -2356,7 +2356,7 @@ VOID ComposePsPoll(IN PRTMP_ADAPTER pAd)
}
/* IRQL = DISPATCH_LEVEL */
-VOID ComposeNullFrame(IN PRTMP_ADAPTER pAd)
+void ComposeNullFrame(IN PRTMP_ADAPTER pAd)
{
NdisZeroMemory(&pAd->NullFrame, sizeof(HEADER_802_11));
pAd->NullFrame.FC.Type = BTYPE_DATA;
@@ -2368,13 +2368,13 @@ VOID ComposeNullFrame(IN PRTMP_ADAPTER pAd)
}
#endif /* RTMP_MAC_PCI // */
#ifdef RTMP_MAC_USB
-VOID MlmeCntlConfirm(IN PRTMP_ADAPTER pAd, IN ULONG MsgType, IN USHORT Msg)
+void MlmeCntlConfirm(IN PRTMP_ADAPTER pAd, unsigned long MsgType, u16 Msg)
{
- MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MsgType, sizeof(USHORT),
+ MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MsgType, sizeof(u16),
&Msg);
}
-VOID ComposePsPoll(IN PRTMP_ADAPTER pAd)
+void ComposePsPoll(IN PRTMP_ADAPTER pAd)
{
PTXINFO_STRUC pTxInfo;
PTXWI_STRUC pTxWI;
@@ -2395,14 +2395,14 @@ VOID ComposePsPoll(IN PRTMP_ADAPTER pAd)
(PTXINFO_STRUC) & pAd->PsPollContext.TransferBuffer->field.
WirelessPacket[0];
RTMPWriteTxInfo(pAd, pTxInfo,
- (USHORT) (sizeof(PSPOLL_FRAME) + TXWI_SIZE), TRUE,
+ (u16)(sizeof(PSPOLL_FRAME) + TXWI_SIZE), TRUE,
EpToQueue[MGMTPIPEIDX], FALSE, FALSE);
pTxWI =
(PTXWI_STRUC) & pAd->PsPollContext.TransferBuffer->field.
WirelessPacket[TXINFO_SIZE];
RTMPWriteTxWI(pAd, pTxWI, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, 0,
BSSID_WCID, (sizeof(PSPOLL_FRAME)), 0, 0,
- (UCHAR) pAd->CommonCfg.MlmeTransmit.field.MCS,
+ (u8)pAd->CommonCfg.MlmeTransmit.field.MCS,
IFS_BACKOFF, FALSE, &pAd->CommonCfg.MlmeTransmit);
RTMPMoveMemory(&pAd->PsPollContext.TransferBuffer->field.
WirelessPacket[TXWI_SIZE + TXINFO_SIZE],
@@ -2413,7 +2413,7 @@ VOID ComposePsPoll(IN PRTMP_ADAPTER pAd)
}
/* IRQL = DISPATCH_LEVEL */
-VOID ComposeNullFrame(IN PRTMP_ADAPTER pAd)
+void ComposeNullFrame(IN PRTMP_ADAPTER pAd)
{
PTXINFO_STRUC pTxInfo;
PTXWI_STRUC pTxWI;
@@ -2431,14 +2431,14 @@ VOID ComposeNullFrame(IN PRTMP_ADAPTER pAd)
(PTXINFO_STRUC) & pAd->NullContext.TransferBuffer->field.
WirelessPacket[0];
RTMPWriteTxInfo(pAd, pTxInfo,
- (USHORT) (sizeof(HEADER_802_11) + TXWI_SIZE), TRUE,
+ (u16)(sizeof(HEADER_802_11) + TXWI_SIZE), TRUE,
EpToQueue[MGMTPIPEIDX], FALSE, FALSE);
pTxWI =
(PTXWI_STRUC) & pAd->NullContext.TransferBuffer->field.
WirelessPacket[TXINFO_SIZE];
RTMPWriteTxWI(pAd, pTxWI, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, 0,
BSSID_WCID, (sizeof(HEADER_802_11)), 0, 0,
- (UCHAR) pAd->CommonCfg.MlmeTransmit.field.MCS,
+ (u8)pAd->CommonCfg.MlmeTransmit.field.MCS,
IFS_BACKOFF, FALSE, &pAd->CommonCfg.MlmeTransmit);
RTMPMoveMemory(&pAd->NullContext.TransferBuffer->field.
WirelessPacket[TXWI_SIZE + TXINFO_SIZE], &pAd->NullFrame,
@@ -2458,22 +2458,22 @@ VOID ComposeNullFrame(IN PRTMP_ADAPTER pAd)
==========================================================================
*/
-ULONG MakeIbssBeacon(IN PRTMP_ADAPTER pAd)
+unsigned long MakeIbssBeacon(IN PRTMP_ADAPTER pAd)
{
- UCHAR DsLen = 1, IbssLen = 2;
- UCHAR LocalErpIe[3] = { IE_ERP, 1, 0x04 };
+ u8 DsLen = 1, IbssLen = 2;
+ u8 LocalErpIe[3] = { IE_ERP, 1, 0x04 };
HEADER_802_11 BcnHdr;
- USHORT CapabilityInfo;
+ u16 CapabilityInfo;
LARGE_INTEGER FakeTimestamp;
- ULONG FrameLen = 0;
+ unsigned long FrameLen = 0;
PTXWI_STRUC pTxWI = &pAd->BeaconTxWI;
- UCHAR *pBeaconFrame = pAd->BeaconBuf;
+ u8 *pBeaconFrame = pAd->BeaconBuf;
BOOLEAN Privacy;
- UCHAR SupRate[MAX_LEN_OF_SUPPORTED_RATES];
- UCHAR SupRateLen = 0;
- UCHAR ExtRate[MAX_LEN_OF_SUPPORTED_RATES];
- UCHAR ExtRateLen = 0;
- UCHAR RSNIe = IE_WPA;
+ u8 SupRate[MAX_LEN_OF_SUPPORTED_RATES];
+ u8 SupRateLen = 0;
+ u8 ExtRate[MAX_LEN_OF_SUPPORTED_RATES];
+ u8 ExtRateLen = 0;
+ u8 RSNIe = IE_WPA;
if ((pAd->CommonCfg.PhyMode == PHY_11B)
&& (pAd->CommonCfg.Channel <= 14)) {
@@ -2560,7 +2560,7 @@ ULONG MakeIbssBeacon(IN PRTMP_ADAPTER pAd)
/* add ERP_IE and EXT_RAE IE of in 802.11g */
if (ExtRateLen) {
- ULONG tmp;
+ unsigned long tmp;
MakeOutgoingFrame(pBeaconFrame + FrameLen, &tmp,
3, LocalErpIe,
@@ -2571,7 +2571,7 @@ ULONG MakeIbssBeacon(IN PRTMP_ADAPTER pAd)
}
/* If adhoc secruity is set for WPA-None, append the cipher suite IE */
if (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPANone) {
- ULONG tmp;
+ unsigned long tmp;
RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus,
BSS0);
@@ -2584,8 +2584,8 @@ ULONG MakeIbssBeacon(IN PRTMP_ADAPTER pAd)
}
if ((pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) {
- ULONG TmpLen;
- UCHAR HtLen, HtLen1;
+ unsigned long TmpLen;
+ u8 HtLen, HtLen1;
/* add HT Capability IE */
HtLen = sizeof(pAd->CommonCfg.HtCapability);
diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c
index db65188ced3b..b40e511ea5b5 100644
--- a/drivers/staging/rt2860/sta/rtmp_data.c
+++ b/drivers/staging/rt2860/sta/rtmp_data.c
@@ -36,13 +36,13 @@
*/
#include "../rt_config.h"
-VOID STARxEAPOLFrameIndicate(IN PRTMP_ADAPTER pAd,
+void STARxEAPOLFrameIndicate(IN PRTMP_ADAPTER pAd,
IN MAC_TABLE_ENTRY * pEntry,
- IN RX_BLK * pRxBlk, IN UCHAR FromWhichBSSID)
+ IN RX_BLK * pRxBlk, u8 FromWhichBSSID)
{
PRT28XX_RXD_STRUC pRxD = &(pRxBlk->RxD);
PRXWI_STRUC pRxWI = pRxBlk->pRxWI;
- UCHAR *pTmpBuf;
+ u8 *pTmpBuf;
if (pAd->StaCfg.WpaSupplicantUP) {
/* All EAPoL frames have to pass to upper layer (ex. WPA_SUPPLICANT daemon) */
@@ -54,8 +54,8 @@ VOID STARxEAPOLFrameIndicate(IN PRTMP_ADAPTER pAd,
WpaCheckEapCode(pAd, pRxBlk->pData,
pRxBlk->DataSize,
LENGTH_802_1_H))) {
- PUCHAR Key;
- UCHAR CipherAlg;
+ u8 *Key;
+ u8 CipherAlg;
int idx = 0;
DBGPRINT_RAW(RT_DEBUG_TRACE,
@@ -138,7 +138,7 @@ VOID STARxEAPOLFrameIndicate(IN PRTMP_ADAPTER pAd,
WepKey.keyinfo.KeyLength = len;
pAd->SharedKey[BSS0][idx].
KeyLen =
- (UCHAR) (len <= 5 ? 5 : 13);
+ (u8)(len <= 5 ? 5 : 13);
pAd->IndicateMediaState =
NdisMediaStateConnected;
@@ -202,9 +202,9 @@ VOID STARxEAPOLFrameIndicate(IN PRTMP_ADAPTER pAd,
}
-VOID STARxDataFrameAnnounce(IN PRTMP_ADAPTER pAd,
+void STARxDataFrameAnnounce(IN PRTMP_ADAPTER pAd,
IN MAC_TABLE_ENTRY * pEntry,
- IN RX_BLK * pRxBlk, IN UCHAR FromWhichBSSID)
+ IN RX_BLK * pRxBlk, u8 FromWhichBSSID)
{
/* non-EAP frame */
@@ -269,11 +269,11 @@ BOOLEAN STACheckTkipMICValue(IN PRTMP_ADAPTER pAd,
IN MAC_TABLE_ENTRY * pEntry, IN RX_BLK * pRxBlk)
{
PHEADER_802_11 pHeader = pRxBlk->pHeader;
- UCHAR *pData = pRxBlk->pData;
- USHORT DataSize = pRxBlk->DataSize;
- UCHAR UserPriority = pRxBlk->UserPriority;
+ u8 *pData = pRxBlk->pData;
+ u16 DataSize = pRxBlk->DataSize;
+ u8 UserPriority = pRxBlk->UserPriority;
PCIPHER_KEY pWpaKey;
- UCHAR *pDA, *pSA;
+ u8 *pDA, *pSA;
pWpaKey = &pAd->SharedKey[BSS0][pRxBlk->pRxWI->KeyIndex];
@@ -318,7 +318,7 @@ BOOLEAN STACheckTkipMICValue(IN PRTMP_ADAPTER pAd,
/* 3. set payload size including LLC to DataSize */
/* 4. set some flags with RX_BLK_SET_FLAG() */
/* */
-VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
+void STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
{
PRT28XX_RXD_STRUC pRxD = &(pRxBlk->RxD);
PRXWI_STRUC pRxWI = pRxBlk->pRxWI;
@@ -326,8 +326,8 @@ VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
PNDIS_PACKET pRxPacket = pRxBlk->pRxPacket;
BOOLEAN bFragment = FALSE;
MAC_TABLE_ENTRY *pEntry = NULL;
- UCHAR FromWhichBSSID = BSS0;
- UCHAR UserPriority = 0;
+ u8 FromWhichBSSID = BSS0;
+ u8 UserPriority = 0;
{
/* before LINK UP, all DATA frames are rejected */
@@ -351,11 +351,11 @@ VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
if (pAd->CommonCfg.bAPSDCapable
&& pAd->CommonCfg.APEdcaParm.bAPSDCapable
&& (pHeader->FC.SubType & 0x08)) {
- UCHAR *pData;
+ u8 *pData;
DBGPRINT(RT_DEBUG_INFO, ("bAPSDCapable\n"));
/* Qos bit 4 */
- pData = (PUCHAR) pHeader + LENGTH_802_11;
+ pData = (u8 *)pHeader + LENGTH_802_11;
if ((*pData >> 4) & 0x01) {
DBGPRINT(RT_DEBUG_INFO,
("RxDone- Rcv EOSP frame, driver may fall into sleep\n"));
@@ -363,14 +363,14 @@ VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
/* Force driver to fall into sleep mode when rcv EOSP frame */
if (!OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) {
- USHORT TbttNumToNextWakeUp;
- USHORT NextDtim =
+ u16 TbttNumToNextWakeUp;
+ u16 NextDtim =
pAd->StaCfg.DtimPeriod;
- ULONG Now;
+ unsigned long Now;
NdisGetSystemUpTime(&Now);
NextDtim -=
- (USHORT) (Now -
+ (u16)(Now -
pAd->StaCfg.
LastBeaconRxTime) /
pAd->CommonCfg.BeaconPeriod;
@@ -459,7 +459,7 @@ VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
}
}
- pRxBlk->pData = (UCHAR *) pHeader;
+ pRxBlk->pData = (u8 *) pHeader;
/* */
/* update RxBlk->pData, DataSize */
@@ -553,7 +553,7 @@ VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
return;
} else if (pRxD->U2M) {
pAd->LastRxRate =
- (USHORT) ((pRxWI->MCS) + (pRxWI->BW << 7) +
+ (u16)((pRxWI->MCS) + (pRxWI->BW << 7) +
(pRxWI->ShortGI << 8) + (pRxWI->PHYMODE << 14));
if (ADHOC_ON(pAd)) {
@@ -565,8 +565,8 @@ VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
Update_Rssi_Sample(pAd, &pAd->StaCfg.RssiSample, pRxWI);
- pAd->StaCfg.LastSNR0 = (UCHAR) (pRxWI->SNR0);
- pAd->StaCfg.LastSNR1 = (UCHAR) (pRxWI->SNR1);
+ pAd->StaCfg.LastSNR0 = (u8)(pRxWI->SNR0);
+ pAd->StaCfg.LastSNR1 = (u8)(pRxWI->SNR1);
pAd->RalinkCounters.OneSecRxOkDataCnt++;
@@ -610,7 +610,7 @@ VOID STAHandleRxDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
RELEASE_NDIS_PACKET(pAd, pRxPacket, NDIS_STATUS_FAILURE);
}
-VOID STAHandleRxMgmtFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
+void STAHandleRxMgmtFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
{
PRT28XX_RXD_STRUC pRxD = &(pRxBlk->RxD);
PRXWI_STRUC pRxWI = pRxBlk->pRxWI;
@@ -637,8 +637,8 @@ VOID STAHandleRxMgmtFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
&& (pAd->RxAnt.EvaluatePeriod == 0)) {
Update_Rssi_Sample(pAd, &pAd->StaCfg.RssiSample, pRxWI);
- pAd->StaCfg.LastSNR0 = (UCHAR) (pRxWI->SNR0);
- pAd->StaCfg.LastSNR1 = (UCHAR) (pRxWI->SNR1);
+ pAd->StaCfg.LastSNR0 = (u8)(pRxWI->SNR0);
+ pAd->StaCfg.LastSNR1 = (u8)(pRxWI->SNR1);
}
/* First check the size, it MUST not exceed the mlme queue size */
@@ -656,7 +656,7 @@ VOID STAHandleRxMgmtFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
RELEASE_NDIS_PACKET(pAd, pRxPacket, NDIS_STATUS_SUCCESS);
}
-VOID STAHandleRxControlFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
+void STAHandleRxControlFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
{
PRXWI_STRUC pRxWI = pRxBlk->pRxWI;
PHEADER_802_11 pHeader = pRxBlk->pHeader;
@@ -700,11 +700,11 @@ VOID STAHandleRxControlFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)
*/
BOOLEAN STARxDoneInterruptHandle(IN PRTMP_ADAPTER pAd, IN BOOLEAN argc)
{
- NDIS_STATUS Status;
- UINT32 RxProcessed, RxPending;
+ int Status;
+ u32 RxProcessed, RxPending;
BOOLEAN bReschedule = FALSE;
RT28XX_RXD_STRUC *pRxD;
- UCHAR *pData;
+ u8 *pData;
PRXWI_STRUC pRxWI;
PNDIS_PACKET pRxPacket;
PHEADER_802_11 pHeader;
@@ -757,7 +757,7 @@ BOOLEAN STARxDoneInterruptHandle(IN PRTMP_ADAPTER pAd, IN BOOLEAN argc)
RxCell.pRxWI = pRxWI;
RxCell.pHeader = pHeader;
RxCell.pRxPacket = pRxPacket;
- RxCell.pData = (UCHAR *) pHeader;
+ RxCell.pData = (u8 *) pHeader;
RxCell.DataSize = pRxWI->MPDUtotalByteCount;
RxCell.Flags = 0;
@@ -833,7 +833,7 @@ BOOLEAN STARxDoneInterruptHandle(IN PRTMP_ADAPTER pAd, IN BOOLEAN argc)
========================================================================
*/
-VOID RTMPHandleTwakeupInterrupt(IN PRTMP_ADAPTER pAd)
+void RTMPHandleTwakeupInterrupt(IN PRTMP_ADAPTER pAd)
{
AsicForceWakeup(pAd, FALSE);
}
@@ -846,7 +846,7 @@ Routine Description:
Arguments:
NDIS_HANDLE MiniportAdapterContext Pointer refer to the device handle, i.e., the pAd.
PPNDIS_PACKET ppPacketArray The packet array need to do transmission.
- UINT NumberOfPackets Number of packet in packet array.
+ u32 NumberOfPackets Number of packet in packet array.
Return Value:
NONE
@@ -856,10 +856,10 @@ Note:
You only can put OS-depened & STA related code in here.
========================================================================
*/
-VOID STASendPackets(IN NDIS_HANDLE MiniportAdapterContext,
- IN PPNDIS_PACKET ppPacketArray, IN UINT NumberOfPackets)
+void STASendPackets(IN NDIS_HANDLE MiniportAdapterContext,
+ IN PPNDIS_PACKET ppPacketArray, u32 NumberOfPackets)
{
- UINT Index;
+ u32 Index;
PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) MiniportAdapterContext;
PNDIS_PACKET pPacket;
BOOLEAN allowToSend = FALSE;
@@ -920,19 +920,19 @@ Note:
You only can put OS-indepened & STA related code in here.
========================================================================
*/
-NDIS_STATUS STASendPacket(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)
+int STASendPacket(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)
{
PACKET_INFO PacketInfo;
- PUCHAR pSrcBufVA;
- UINT SrcBufLen;
- UINT AllowFragSize;
- UCHAR NumberOfFrag;
- UCHAR RTSRequired;
- UCHAR QueIdx, UserPriority;
+ u8 *pSrcBufVA;
+ u32 SrcBufLen;
+ u32 AllowFragSize;
+ u8 NumberOfFrag;
+ u8 RTSRequired;
+ u8 QueIdx, UserPriority;
MAC_TABLE_ENTRY *pEntry = NULL;
unsigned int IrqFlags;
- UCHAR FlgIsIP = 0;
- UCHAR Rate;
+ u8 FlgIsIP = 0;
+ u8 Rate;
/* Prepare packet information structure for buffer descriptor */
/* chained within a single NDIS packet. */
@@ -986,7 +986,7 @@ NDIS_STATUS STASendPacket(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)
if (ADHOC_ON(pAd)
) {
- RTMP_SET_PACKET_WCID(pPacket, (UCHAR) pEntry->Aid);
+ RTMP_SET_PACKET_WCID(pPacket, (u8)pEntry->Aid);
}
/* */
/* Check the Ethernet Frame type of this packet, and set the RTMP_SET_PACKET_SPECIFIC flags. */
@@ -1079,12 +1079,12 @@ NDIS_STATUS STASendPacket(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)
QueIdx = QID_AC_BE;
if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED) &&
CLIENT_STATUS_TEST_FLAG(pEntry, fCLIENT_STATUS_WMM_CAPABLE)) {
- USHORT Protocol;
- UCHAR LlcSnapLen = 0, Byte0, Byte1;
+ u16 Protocol;
+ u8 LlcSnapLen = 0, Byte0, Byte1;
do {
/* get Ethernet protocol field */
Protocol =
- (USHORT) ((pSrcBufVA[12] << 8) + pSrcBufVA[13]);
+ (u16)((pSrcBufVA[12] << 8) + pSrcBufVA[13]);
if (Protocol <= 1500) {
/* get Ethernet protocol field from LLC/SNAP */
if (Sniff2BytesFromNdisBuffer
@@ -1092,7 +1092,7 @@ NDIS_STATUS STASendPacket(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)
&Byte0, &Byte1) != NDIS_STATUS_SUCCESS)
break;
- Protocol = (USHORT) ((Byte0 << 8) + Byte1);
+ Protocol = (u16)((Byte0 << 8) + Byte1);
LlcSnapLen = 8;
}
/* always AC_BE for non-IP packet */
@@ -1189,12 +1189,12 @@ NDIS_STATUS STASendPacket(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)
========================================================================
*/
#ifdef RTMP_MAC_PCI
-NDIS_STATUS RTMPFreeTXDRequest(IN PRTMP_ADAPTER pAd,
- IN UCHAR QueIdx,
- IN UCHAR NumberRequired, IN PUCHAR FreeNumberIs)
+int RTMPFreeTXDRequest(IN PRTMP_ADAPTER pAd,
+ u8 QueIdx,
+ u8 NumberRequired, u8 *FreeNumberIs)
{
- ULONG FreeNumber = 0;
- NDIS_STATUS Status = NDIS_STATUS_FAILURE;
+ unsigned long FreeNumber = 0;
+ int Status = NDIS_STATUS_FAILURE;
switch (QueIdx) {
case QID_AC_BK:
@@ -1234,7 +1234,7 @@ NDIS_STATUS RTMPFreeTXDRequest(IN PRTMP_ADAPTER pAd,
("RTMPFreeTXDRequest::Invalid QueIdx(=%d)\n", QueIdx));
break;
}
- *FreeNumberIs = (UCHAR) FreeNumber;
+ *FreeNumberIs = (u8)FreeNumber;
return (Status);
}
@@ -1244,12 +1244,12 @@ NDIS_STATUS RTMPFreeTXDRequest(IN PRTMP_ADAPTER pAd,
Actually, this function used to check if the TxHardware Queue still has frame need to send.
If no frame need to send, go to sleep, else, still wake up.
*/
-NDIS_STATUS RTMPFreeTXDRequest(IN PRTMP_ADAPTER pAd,
- IN UCHAR QueIdx,
- IN UCHAR NumberRequired, IN PUCHAR FreeNumberIs)
+int RTMPFreeTXDRequest(IN PRTMP_ADAPTER pAd,
+ u8 QueIdx,
+ u8 NumberRequired, u8 *FreeNumberIs)
{
- /*ULONG FreeNumber = 0; */
- NDIS_STATUS Status = NDIS_STATUS_FAILURE;
+ /*unsigned long FreeNumber = 0; */
+ int Status = NDIS_STATUS_FAILURE;
unsigned long IrqFlags;
HT_TX_CONTEXT *pHTTXContext;
@@ -1289,15 +1289,15 @@ NDIS_STATUS RTMPFreeTXDRequest(IN PRTMP_ADAPTER pAd,
}
#endif /* RTMP_MAC_USB // */
-VOID RTMPSendDisassociationFrame(IN PRTMP_ADAPTER pAd)
+void RTMPSendDisassociationFrame(IN PRTMP_ADAPTER pAd)
{
}
-VOID RTMPSendNullFrame(IN PRTMP_ADAPTER pAd,
- IN UCHAR TxRate, IN BOOLEAN bQosNull)
+void RTMPSendNullFrame(IN PRTMP_ADAPTER pAd,
+ u8 TxRate, IN BOOLEAN bQosNull)
{
- UCHAR NullFrame[48];
- ULONG Length;
+ u8 NullFrame[48];
+ unsigned long Length;
PHEADER_802_11 pHeader_802_11;
/* WPA 802.1x secured port control */
@@ -1349,12 +1349,12 @@ VOID RTMPSendNullFrame(IN PRTMP_ADAPTER pAd,
}
/* IRQL = DISPATCH_LEVEL */
-VOID RTMPSendRTSFrame(IN PRTMP_ADAPTER pAd,
- IN PUCHAR pDA,
+void RTMPSendRTSFrame(IN PRTMP_ADAPTER pAd,
+ u8 *pDA,
IN unsigned int NextMpduSize,
- IN UCHAR TxRate,
- IN UCHAR RTSRate,
- IN USHORT AckDuration, IN UCHAR QueIdx, IN UCHAR FrameGap)
+ u8 TxRate,
+ u8 RTSRate,
+ u16 AckDuration, u8 QueIdx, u8 FrameGap)
{
}
@@ -1367,12 +1367,12 @@ VOID RTMPSendRTSFrame(IN PRTMP_ADAPTER pAd,
/* In Cisco CCX 2.0 Leap Authentication */
/* WepStatus is Ndis802_11Encryption1Enabled but the key will use PairwiseKey */
/* Instead of the SharedKey, SharedKey Length may be Zero. */
-VOID STAFindCipherAlgorithm(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
+void STAFindCipherAlgorithm(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
{
NDIS_802_11_ENCRYPTION_STATUS Cipher; /* To indicate cipher used for this packet */
- UCHAR CipherAlg = CIPHER_NONE; /* cipher alogrithm */
- UCHAR KeyIdx = 0xff;
- PUCHAR pSrcBufVA;
+ u8 CipherAlg = CIPHER_NONE; /* cipher alogrithm */
+ u8 KeyIdx = 0xff;
+ u8 *pSrcBufVA;
PCIPHER_KEY pKey = NULL;
pSrcBufVA = GET_OS_PKT_DATAPTR(pTxBlk->pPacket);
@@ -1429,7 +1429,7 @@ VOID STAFindCipherAlgorithm(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
pTxBlk->pKey = pKey;
}
-VOID STABuildCommon802_11Header(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
+void STABuildCommon802_11Header(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
{
HEADER_802_11 *pHeader_802_11;
@@ -1510,8 +1510,8 @@ VOID STABuildCommon802_11Header(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
pHeader_802_11->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE);
}
-VOID STABuildCache802_11Header(IN RTMP_ADAPTER * pAd,
- IN TX_BLK * pTxBlk, IN UCHAR * pHeader)
+void STABuildCache802_11Header(IN RTMP_ADAPTER * pAd,
+ IN TX_BLK * pTxBlk, u8 * pHeader)
{
MAC_TABLE_ENTRY *pMacEntry;
PHEADER_802_11 pHeader80211;
@@ -1556,13 +1556,13 @@ VOID STABuildCache802_11Header(IN RTMP_ADAPTER * pAd,
pHeader80211->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE);
}
-static inline PUCHAR STA_Build_ARalink_Frame_Header(IN RTMP_ADAPTER * pAd,
+static inline u8 *STA_Build_ARalink_Frame_Header(IN RTMP_ADAPTER * pAd,
IN TX_BLK * pTxBlk)
{
- PUCHAR pHeaderBufPtr;
+ u8 *pHeaderBufPtr;
HEADER_802_11 *pHeader_802_11;
PNDIS_PACKET pNextPacket;
- UINT32 nextBufLen;
+ u32 nextBufLen;
PQUEUE_ENTRY pQEntry;
STAFindCipherAlgorithm(pAd, pTxBlk);
@@ -1588,9 +1588,9 @@ static inline PUCHAR STA_Build_ARalink_Frame_Header(IN RTMP_ADAPTER * pAd,
pTxBlk->MpduHeaderLen += 2;
}
/* padding at front of LLC header. LLC header should at 4-bytes aligment. */
- pTxBlk->HdrPadLen = (ULONG) pHeaderBufPtr;
- pHeaderBufPtr = (PUCHAR) ROUND_UP(pHeaderBufPtr, 4);
- pTxBlk->HdrPadLen = (ULONG) (pHeaderBufPtr - pTxBlk->HdrPadLen);
+ pTxBlk->HdrPadLen = (unsigned long)pHeaderBufPtr;
+ pHeaderBufPtr = (u8 *)ROUND_UP(pHeaderBufPtr, 4);
+ pTxBlk->HdrPadLen = (unsigned long)(pHeaderBufPtr - pTxBlk->HdrPadLen);
/* For RA Aggregation, */
/* put the 2nd MSDU length(extra 2-byte field) after QOS_CONTROL in little endian format */
@@ -1600,8 +1600,8 @@ static inline PUCHAR STA_Build_ARalink_Frame_Header(IN RTMP_ADAPTER * pAd,
if (RTMP_GET_PACKET_VLAN(pNextPacket))
nextBufLen -= LENGTH_802_1Q;
- *pHeaderBufPtr = (UCHAR) nextBufLen & 0xff;
- *(pHeaderBufPtr + 1) = (UCHAR) (nextBufLen >> 8);
+ *pHeaderBufPtr = (u8)nextBufLen & 0xff;
+ *(pHeaderBufPtr + 1) = (u8)(nextBufLen >> 8);
pHeaderBufPtr += 2;
pTxBlk->MpduHeaderLen += 2;
@@ -1610,10 +1610,10 @@ static inline PUCHAR STA_Build_ARalink_Frame_Header(IN RTMP_ADAPTER * pAd,
}
-static inline PUCHAR STA_Build_AMSDU_Frame_Header(IN RTMP_ADAPTER * pAd,
+static inline u8 *STA_Build_AMSDU_Frame_Header(IN RTMP_ADAPTER * pAd,
IN TX_BLK * pTxBlk)
{
- PUCHAR pHeaderBufPtr; /*, pSaveBufPtr; */
+ u8 *pHeaderBufPtr; /*, pSaveBufPtr; */
HEADER_802_11 *pHeader_802_11;
STAFindCipherAlgorithm(pAd, pTxBlk);
@@ -1647,19 +1647,19 @@ static inline PUCHAR STA_Build_AMSDU_Frame_Header(IN RTMP_ADAPTER * pAd,
/* */
/* @@@ MpduHeaderLen excluding padding @@@ */
/* */
- pTxBlk->HdrPadLen = (ULONG) pHeaderBufPtr;
- pHeaderBufPtr = (PUCHAR) ROUND_UP(pHeaderBufPtr, 4);
- pTxBlk->HdrPadLen = (ULONG) (pHeaderBufPtr - pTxBlk->HdrPadLen);
+ pTxBlk->HdrPadLen = (unsigned long)pHeaderBufPtr;
+ pHeaderBufPtr = (u8 *)ROUND_UP(pHeaderBufPtr, 4);
+ pTxBlk->HdrPadLen = (unsigned long)(pHeaderBufPtr - pTxBlk->HdrPadLen);
return pHeaderBufPtr;
}
-VOID STA_AMPDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
+void STA_AMPDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
{
HEADER_802_11 *pHeader_802_11;
- PUCHAR pHeaderBufPtr;
- USHORT FreeNumber;
+ u8 *pHeaderBufPtr;
+ u16 FreeNumber;
MAC_TABLE_ENTRY *pMacEntry;
BOOLEAN bVLANPkt;
PQUEUE_ENTRY pQEntry;
@@ -1681,12 +1681,12 @@ VOID STA_AMPDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
pMacEntry = pTxBlk->pMacEntry;
if (pMacEntry->isCached) {
/* NOTE: Please make sure the size of pMacEntry->CachedBuf[] is smaller than pTxBlk->HeaderBuf[]!!!! */
- NdisMoveMemory((PUCHAR) & pTxBlk->
+ NdisMoveMemory((u8 *)& pTxBlk->
HeaderBuf[TXINFO_SIZE],
- (PUCHAR) & pMacEntry->CachedBuf[0],
+ (u8 *)& pMacEntry->CachedBuf[0],
TXWI_SIZE + sizeof(HEADER_802_11));
pHeaderBufPtr =
- (PUCHAR) (&pTxBlk->
+ (u8 *)(&pTxBlk->
HeaderBuf[TXINFO_SIZE + TXWI_SIZE]);
STABuildCache802_11Header(pAd, pTxBlk, pHeaderBufPtr);
} else {
@@ -1745,9 +1745,9 @@ VOID STA_AMPDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
/* */
/* @@@ MpduHeaderLen excluding padding @@@ */
/* */
- pTxBlk->HdrPadLen = (ULONG) pHeaderBufPtr;
- pHeaderBufPtr = (PUCHAR) ROUND_UP(pHeaderBufPtr, 4);
- pTxBlk->HdrPadLen = (ULONG) (pHeaderBufPtr - pTxBlk->HdrPadLen);
+ pTxBlk->HdrPadLen = (unsigned long)pHeaderBufPtr;
+ pHeaderBufPtr = (u8 *)ROUND_UP(pHeaderBufPtr, 4);
+ pTxBlk->HdrPadLen = (unsigned long)(pHeaderBufPtr - pTxBlk->HdrPadLen);
{
@@ -1784,13 +1784,13 @@ VOID STA_AMPDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
[TXINFO_SIZE]),
pTxBlk);
- NdisZeroMemory((PUCHAR) (&pMacEntry->CachedBuf[0]),
+ NdisZeroMemory((u8 *)(&pMacEntry->CachedBuf[0]),
sizeof(pMacEntry->CachedBuf));
- NdisMoveMemory((PUCHAR) (&pMacEntry->CachedBuf[0]),
- (PUCHAR) (&pTxBlk->
+ NdisMoveMemory((u8 *)(&pMacEntry->CachedBuf[0]),
+ (u8 *)(&pTxBlk->
HeaderBuf[TXINFO_SIZE]),
(pHeaderBufPtr -
- (PUCHAR) (&pTxBlk->
+ (u8 *)(&pTxBlk->
HeaderBuf[TXINFO_SIZE])));
pMacEntry->isCached = TRUE;
}
@@ -1819,15 +1819,15 @@ VOID STA_AMPDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
}
-VOID STA_AMSDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
+void STA_AMSDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
{
- PUCHAR pHeaderBufPtr;
- USHORT FreeNumber;
- USHORT subFramePayloadLen = 0; /* AMSDU Subframe length without AMSDU-Header / Padding. */
- USHORT totalMPDUSize = 0;
- UCHAR *subFrameHeader;
- UCHAR padding = 0;
- USHORT FirstTx = 0, LastTxIdx = 0;
+ u8 *pHeaderBufPtr;
+ u16 FreeNumber;
+ u16 subFramePayloadLen = 0; /* AMSDU Subframe length without AMSDU-Header / Padding. */
+ u16 totalMPDUSize = 0;
+ u8 *subFrameHeader;
+ u8 padding = 0;
+ u16 FirstTx = 0, LastTxIdx = 0;
BOOLEAN bVLANPkt;
int frameNum = 0;
PQUEUE_ENTRY pQEntry;
@@ -1951,11 +1951,11 @@ VOID STA_AMSDU_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
HAL_KickOutTx(pAd, pTxBlk, pTxBlk->QueIdx);
}
-VOID STA_Legacy_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
+void STA_Legacy_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
{
HEADER_802_11 *pHeader_802_11;
- PUCHAR pHeaderBufPtr;
- USHORT FreeNumber;
+ u8 *pHeaderBufPtr;
+ u16 FreeNumber;
BOOLEAN bVLANPkt;
PQUEUE_ENTRY pQEntry;
@@ -2014,9 +2014,9 @@ VOID STA_Legacy_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
pTxBlk->MpduHeaderLen += 2;
}
/* The remaining content of MPDU header should locate at 4-octets aligment */
- pTxBlk->HdrPadLen = (ULONG) pHeaderBufPtr;
- pHeaderBufPtr = (PUCHAR) ROUND_UP(pHeaderBufPtr, 4);
- pTxBlk->HdrPadLen = (ULONG) (pHeaderBufPtr - pTxBlk->HdrPadLen);
+ pTxBlk->HdrPadLen = (unsigned long)pHeaderBufPtr;
+ pHeaderBufPtr = (u8 *)ROUND_UP(pHeaderBufPtr, 4);
+ pTxBlk->HdrPadLen = (unsigned long)(pHeaderBufPtr - pTxBlk->HdrPadLen);
{
@@ -2030,7 +2030,7 @@ VOID STA_Legacy_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
EXTRA_LLCSNAP_ENCAP_FROM_PKT_START(pTxBlk->pSrcBufHeader,
pTxBlk->pExtraLlcSnapEncap);
if (pTxBlk->pExtraLlcSnapEncap) {
- UCHAR vlan_size;
+ u8 vlan_size;
NdisMoveMemory(pHeaderBufPtr,
pTxBlk->pExtraLlcSnapEncap, 6);
@@ -2069,12 +2069,12 @@ VOID STA_Legacy_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
HAL_KickOutTx(pAd, pTxBlk, pTxBlk->QueIdx);
}
-VOID STA_ARalink_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
+void STA_ARalink_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
{
- PUCHAR pHeaderBufPtr;
- USHORT FreeNumber;
- USHORT totalMPDUSize = 0;
- USHORT FirstTx, LastTxIdx;
+ u8 *pHeaderBufPtr;
+ u16 FreeNumber;
+ u16 totalMPDUSize = 0;
+ u16 FirstTx, LastTxIdx;
int frameNum = 0;
BOOLEAN bVLANPkt;
PQUEUE_ENTRY pQEntry;
@@ -2186,17 +2186,17 @@ VOID STA_ARalink_Frame_Tx(IN PRTMP_ADAPTER pAd, IN TX_BLK * pTxBlk)
}
-VOID STA_Fragment_Frame_Tx(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)
+void STA_Fragment_Frame_Tx(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)
{
HEADER_802_11 *pHeader_802_11;
- PUCHAR pHeaderBufPtr;
- USHORT FreeNumber;
- UCHAR fragNum = 0;
+ u8 *pHeaderBufPtr;
+ u16 FreeNumber;
+ u8 fragNum = 0;
PACKET_INFO PacketInfo;
- USHORT EncryptionOverhead = 0;
- UINT32 FreeMpduSize, SrcRemainingBytes;
- USHORT AckDuration;
- UINT NextMpduSize;
+ u16 EncryptionOverhead = 0;
+ u32 FreeMpduSize, SrcRemainingBytes;
+ u16 AckDuration;
+ u32 NextMpduSize;
BOOLEAN bVLANPkt;
PQUEUE_ENTRY pQEntry;
HTTRANSMIT_SETTING *pTransmit;
@@ -2255,9 +2255,9 @@ VOID STA_Fragment_Frame_Tx(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)
/* padding at front of LLC header */
/* LLC header should locate at 4-octets aligment */
/* */
- pTxBlk->HdrPadLen = (ULONG) pHeaderBufPtr;
- pHeaderBufPtr = (PUCHAR) ROUND_UP(pHeaderBufPtr, 4);
- pTxBlk->HdrPadLen = (ULONG) (pHeaderBufPtr - pTxBlk->HdrPadLen);
+ pTxBlk->HdrPadLen = (unsigned long)pHeaderBufPtr;
+ pHeaderBufPtr = (u8 *)ROUND_UP(pHeaderBufPtr, 4);
+ pTxBlk->HdrPadLen = (unsigned long)(pHeaderBufPtr - pTxBlk->HdrPadLen);
/* */
/* Insert LLC-SNAP encapsulation - 8 octets */
@@ -2269,7 +2269,7 @@ VOID STA_Fragment_Frame_Tx(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)
EXTRA_LLCSNAP_ENCAP_FROM_PKT_START(pTxBlk->pSrcBufHeader,
pTxBlk->pExtraLlcSnapEncap);
if (pTxBlk->pExtraLlcSnapEncap) {
- UCHAR vlan_size;
+ u8 vlan_size;
NdisMoveMemory(pHeaderBufPtr, pTxBlk->pExtraLlcSnapEncap, 6);
pHeaderBufPtr += 6;
@@ -2360,8 +2360,8 @@ VOID STA_Fragment_Frame_Tx(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)
pTxBlk->SrcBufLen = FreeMpduSize;
NextMpduSize =
- min(((UINT) SrcRemainingBytes - pTxBlk->SrcBufLen),
- ((UINT) pAd->CommonCfg.FragmentThreshold));
+ min(((u32)SrcRemainingBytes - pTxBlk->SrcBufLen),
+ ((u32)pAd->CommonCfg.FragmentThreshold));
pHeader_802_11->FC.MoreFrag = 1;
pHeader_802_11->Duration =
(3 * pAd->CommonCfg.Dsifs) + (2 * AckDuration) +
@@ -2434,8 +2434,8 @@ VOID STA_Fragment_Frame_Tx(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)
========================================================================
*/
-NDIS_STATUS STAHardTransmit(IN PRTMP_ADAPTER pAd,
- IN TX_BLK * pTxBlk, IN UCHAR QueIdx)
+int STAHardTransmit(IN PRTMP_ADAPTER pAd,
+ IN TX_BLK * pTxBlk, u8 QueIdx)
{
NDIS_PACKET *pPacket;
PQUEUE_ENTRY pQEntry;
@@ -2523,7 +2523,7 @@ NDIS_STATUS STAHardTransmit(IN PRTMP_ADAPTER pAd,
}
-ULONG HashBytesPolynomial(UCHAR * value, unsigned int len)
+unsigned long HashBytesPolynomial(u8 * value, unsigned int len)
{
unsigned char *word = value;
unsigned int ret = 0;
@@ -2537,9 +2537,9 @@ ULONG HashBytesPolynomial(UCHAR * value, unsigned int len)
return ret;
}
-VOID Sta_Announce_or_Forward_802_3_Packet(IN PRTMP_ADAPTER pAd,
+void Sta_Announce_or_Forward_802_3_Packet(IN PRTMP_ADAPTER pAd,
IN PNDIS_PACKET pPacket,
- IN UCHAR FromWhichBSSID)
+ u8 FromWhichBSSID)
{
if (TRUE) {
announce_802_3_packet(pAd, pPacket);
diff --git a/drivers/staging/rt2860/sta/sanity.c b/drivers/staging/rt2860/sta/sanity.c
index ba6eaf670f10..a79348f43bc4 100644
--- a/drivers/staging/rt2860/sta/sanity.c
+++ b/drivers/staging/rt2860/sta/sanity.c
@@ -36,15 +36,15 @@
*/
#include "../rt_config.h"
-extern UCHAR CISCO_OUI[];
+extern u8 CISCO_OUI[];
-extern UCHAR WPA_OUI[];
-extern UCHAR RSN_OUI[];
-extern UCHAR WME_INFO_ELEM[];
-extern UCHAR WME_PARM_ELEM[];
-extern UCHAR Ccx2QosInfo[];
-extern UCHAR RALINK_OUI[];
-extern UCHAR BROADCOM_OUI[];
+extern u8 WPA_OUI[];
+extern u8 RSN_OUI[];
+extern u8 WME_INFO_ELEM[];
+extern u8 WME_PARM_ELEM[];
+extern u8 Ccx2QosInfo[];
+extern u8 RALINK_OUI[];
+extern u8 BROADCOM_OUI[];
/*
==========================================================================
@@ -55,9 +55,9 @@ extern UCHAR BROADCOM_OUI[];
==========================================================================
*/
BOOLEAN MlmeStartReqSanity(IN PRTMP_ADAPTER pAd,
- IN VOID * Msg,
- IN ULONG MsgLen,
- OUT CHAR Ssid[], OUT UCHAR * pSsidLen)
+ void * Msg,
+ unsigned long MsgLen,
+ char Ssid[], u8 * pSsidLen)
{
MLME_START_REQ_STRUCT *Info;
@@ -86,22 +86,22 @@ BOOLEAN MlmeStartReqSanity(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen, OUT PUCHAR pAddr2, OUT USHORT * pCapabilityInfo, OUT USHORT * pStatus, OUT USHORT * pAid, OUT UCHAR SupRate[], OUT UCHAR * pSupRateLen, OUT UCHAR ExtRate[], OUT UCHAR * pExtRateLen, OUT HT_CAPABILITY_IE * pHtCapability, OUT ADD_HT_INFO_IE * pAddHtInfo, /* AP might use this additional ht info IE */
- OUT UCHAR * pHtCapabilityLen,
- OUT UCHAR * pAddHtInfoLen,
- OUT UCHAR * pNewExtChannelOffset,
- OUT PEDCA_PARM pEdcaParm, OUT UCHAR * pCkipFlag)
+BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, void * pMsg, unsigned long MsgLen, u8 *pAddr2, u16 * pCapabilityInfo, u16 * pStatus, u16 * pAid, u8 SupRate[], u8 * pSupRateLen, u8 ExtRate[], u8 * pExtRateLen, OUT HT_CAPABILITY_IE * pHtCapability, OUT ADD_HT_INFO_IE * pAddHtInfo, /* AP might use this additional ht info IE */
+ u8 * pHtCapabilityLen,
+ u8 * pAddHtInfoLen,
+ u8 * pNewExtChannelOffset,
+ OUT PEDCA_PARM pEdcaParm, u8 * pCkipFlag)
{
- CHAR IeType, *Ptr;
+ char IeType, *Ptr;
PFRAME_802_11 pFrame = (PFRAME_802_11) pMsg;
PEID_STRUCT pEid;
- ULONG Length = 0;
+ unsigned long Length = 0;
*pNewExtChannelOffset = 0xff;
*pHtCapabilityLen = 0;
*pAddHtInfoLen = 0;
COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
- Ptr = (PCHAR) pFrame->Octet;
+ Ptr = (char *)pFrame->Octet;
Length += LENGTH_802_11;
NdisMoveMemory(pCapabilityInfo, &pFrame->Octet[0], 2);
@@ -155,11 +155,11 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
NdisMoveMemory(pHtCapability, pEid->Octet,
SIZE_HT_CAP_IE);
- *(USHORT *) (&pHtCapability->HtCapInfo) =
- cpu2le16(*(USHORT *)
+ *(u16 *) (&pHtCapability->HtCapInfo) =
+ cpu2le16(*(u16 *)
(&pHtCapability->HtCapInfo));
- *(USHORT *) (&pHtCapability->ExtHtCapInfo) =
- cpu2le16(*(USHORT *)
+ *(u16 *) (&pHtCapability->ExtHtCapInfo) =
+ cpu2le16(*(u16 *)
(&pHtCapability->ExtHtCapInfo));
*pHtCapabilityLen = SIZE_HT_CAP_IE;
@@ -177,11 +177,11 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
NdisMoveMemory(pAddHtInfo, pEid->Octet,
sizeof(ADD_HT_INFO_IE));
- *(USHORT *) (&pAddHtInfo->AddHtInfo2) =
- cpu2le16(*(USHORT *)
+ *(u16 *) (&pAddHtInfo->AddHtInfo2) =
+ cpu2le16(*(u16 *)
(&pAddHtInfo->AddHtInfo2));
- *(USHORT *) (&pAddHtInfo->AddHtInfo3) =
- cpu2le16(*(USHORT *)
+ *(u16 *) (&pAddHtInfo->AddHtInfo3) =
+ cpu2le16(*(u16 *)
(&pAddHtInfo->AddHtInfo3));
*pAddHtInfoLen = SIZE_ADD_HT_INFO_IE;
@@ -204,7 +204,7 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
/* handle WME PARAMTER ELEMENT */
if (NdisEqualMemory(pEid->Octet, WME_PARM_ELEM, 6)
&& (pEid->Len == 24)) {
- PUCHAR ptr;
+ u8 *ptr;
int i;
/* parsing EDCA parameters */
@@ -217,9 +217,9 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
pEid->Octet[6] & 0x0f;
pEdcaParm->bAPSDCapable =
(pEid->Octet[6] & 0x80) ? 1 : 0;
- ptr = (PUCHAR) & pEid->Octet[8];
+ ptr = (u8 *)& pEid->Octet[8];
for (i = 0; i < 4; i++) {
- UCHAR aci = (*ptr & 0x60) >> 5; /* b5~6 is AC INDEX */
+ u8 aci = (*ptr & 0x60) >> 5; /* b5~6 is AC INDEX */
pEdcaParm->bACM[aci] = (((*ptr) & 0x10) == 0x10); /* b5 is ACM */
pEdcaParm->Aifsn[aci] = (*ptr) & 0x0f; /* b0~3 is AIFSN */
pEdcaParm->Cwmin[aci] = *(ptr + 1) & 0x0f; /* b0~4 is Cwmin */
@@ -237,7 +237,7 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
}
Length = Length + 2 + pEid->Len;
- pEid = (PEID_STRUCT) ((UCHAR *) pEid + 2 + pEid->Len);
+ pEid = (PEID_STRUCT) ((u8 *) pEid + 2 + pEid->Len);
}
return TRUE;
@@ -255,14 +255,14 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
==========================================================================
*/
BOOLEAN PeerProbeReqSanity(IN PRTMP_ADAPTER pAd,
- IN VOID * Msg,
- IN ULONG MsgLen,
- OUT PUCHAR pAddr2,
- OUT CHAR Ssid[], OUT UCHAR * pSsidLen)
+ void * Msg,
+ unsigned long MsgLen,
+ u8 *pAddr2,
+ char Ssid[], u8 * pSsidLen)
{
- UCHAR Idx;
- UCHAR RateLen;
- CHAR IeType;
+ u8 Idx;
+ u8 RateLen;
+ char IeType;
PFRAME_802_11 pFrame = (PFRAME_802_11) Msg;
COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
@@ -304,15 +304,15 @@ BOOLEAN PeerProbeReqSanity(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-BOOLEAN GetTimBit(IN CHAR * Ptr,
- IN USHORT Aid,
- OUT UCHAR * TimLen,
- OUT UCHAR * BcastFlag,
- OUT UCHAR * DtimCount,
- OUT UCHAR * DtimPeriod, OUT UCHAR * MessageToMe)
+BOOLEAN GetTimBit(char * Ptr,
+ u16 Aid,
+ u8 * TimLen,
+ u8 * BcastFlag,
+ u8 * DtimCount,
+ u8 * DtimPeriod, u8 * MessageToMe)
{
- UCHAR BitCntl, N1, N2, MyByte, MyBit;
- CHAR *IdxPtr;
+ u8 BitCntl, N1, N2, MyByte, MyBit;
+ char *IdxPtr;
IdxPtr = Ptr;
diff --git a/drivers/staging/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c
index 12ab2d40b0b9..448e75f0df16 100644
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -50,7 +50,7 @@
==========================================================================
*/
-VOID SyncStateMachineInit(IN PRTMP_ADAPTER pAd,
+void SyncStateMachineInit(IN PRTMP_ADAPTER pAd,
IN STATE_MACHINE * Sm, OUT STATE_MACHINE_FUNC Trans[])
{
StateMachineInit(Sm, Trans, MAX_SYNC_STATE, MAX_SYNC_MSG,
@@ -111,9 +111,9 @@ VOID SyncStateMachineInit(IN PRTMP_ADAPTER pAd,
==========================================================================
*/
-VOID BeaconTimeout(IN PVOID SystemSpecific1,
- IN PVOID FunctionContext,
- IN PVOID SystemSpecific2, IN PVOID SystemSpecific3)
+void BeaconTimeout(void *SystemSpecific1,
+ void *FunctionContext,
+ void *SystemSpecific2, void *SystemSpecific3)
{
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext;
@@ -126,7 +126,7 @@ VOID BeaconTimeout(IN PVOID SystemSpecific1,
if ((pAd->CommonCfg.BBPCurrentBW == BW_40)
) {
- UCHAR BBPValue = 0;
+ u8 BBPValue = 0;
AsicSwitchChannel(pAd, pAd->CommonCfg.CentralChannel, FALSE);
AsicLockChannel(pAd, pAd->CommonCfg.CentralChannel);
RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R4, &BBPValue);
@@ -151,9 +151,9 @@ VOID BeaconTimeout(IN PVOID SystemSpecific1,
==========================================================================
*/
-VOID ScanTimeout(IN PVOID SystemSpecific1,
- IN PVOID FunctionContext,
- IN PVOID SystemSpecific2, IN PVOID SystemSpecific3)
+void ScanTimeout(void *SystemSpecific1,
+ void *FunctionContext,
+ void *SystemSpecific2, void *SystemSpecific3)
{
RTMP_ADAPTER *pAd = (RTMP_ADAPTER *) FunctionContext;
@@ -183,15 +183,15 @@ VOID ScanTimeout(IN PVOID SystemSpecific1,
MLME SCAN req state machine procedure
==========================================================================
*/
-VOID MlmeScanReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeScanReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Ssid[MAX_LEN_OF_SSID], SsidLen, ScanType, BssType, BBPValue = 0;
+ u8 Ssid[MAX_LEN_OF_SSID], SsidLen, ScanType, BssType, BBPValue = 0;
BOOLEAN TimerCancelled;
- ULONG Now;
- USHORT Status;
+ unsigned long Now;
+ u16 Status;
PHEADER_802_11 pHdr80211;
- PUCHAR pOutBuffer = NULL;
- NDIS_STATUS NStatus;
+ u8 *pOutBuffer = NULL;
+ int NStatus;
/* Check the total scan tries for one single OID command */
/* If this is the CCX 2.0 Case, skip that! */
@@ -225,7 +225,7 @@ VOID MlmeScanReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
if (MlmeScanReqSanity(pAd,
Elem->Msg,
Elem->MsgLen,
- &BssType, (PCHAR) Ssid, &SsidLen, &ScanType)) {
+ &BssType, (char *)Ssid, &SsidLen, &ScanType)) {
/* Check for channel load and noise hist request */
/* Suspend MSDU only at scan request, not the last two mentioned */
@@ -239,7 +239,7 @@ VOID MlmeScanReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* */
if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED)
&& (INFRA_ON(pAd))) {
- NStatus = MlmeAllocateMemory(pAd, (PVOID) & pOutBuffer);
+ NStatus = MlmeAllocateMemory(pAd, (void *)& pOutBuffer);
if (NStatus == NDIS_STATUS_SUCCESS) {
pHdr80211 = (PHEADER_802_11) pOutBuffer;
MgtMacHeaderInit(pAd, pHdr80211,
@@ -297,21 +297,21 @@ VOID MlmeScanReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
MLME JOIN req state machine procedure
==========================================================================
*/
-VOID MlmeJoinReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeJoinReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR BBPValue = 0;
+ u8 BBPValue = 0;
BSS_ENTRY *pBss;
BOOLEAN TimerCancelled;
HEADER_802_11 Hdr80211;
- NDIS_STATUS NStatus;
- ULONG FrameLen = 0;
- PUCHAR pOutBuffer = NULL;
- PUCHAR pSupRate = NULL;
- UCHAR SupRateLen;
- PUCHAR pExtRate = NULL;
- UCHAR ExtRateLen;
- UCHAR ASupRate[] = { 0x8C, 0x12, 0x98, 0x24, 0xb0, 0x48, 0x60, 0x6C };
- UCHAR ASupRateLen = sizeof(ASupRate) / sizeof(UCHAR);
+ int NStatus;
+ unsigned long FrameLen = 0;
+ u8 *pOutBuffer = NULL;
+ u8 *pSupRate = NULL;
+ u8 SupRateLen;
+ u8 *pExtRate = NULL;
+ u8 ExtRateLen;
+ u8 ASupRate[] = { 0x8C, 0x12, 0x98, 0x24, 0xb0, 0x48, 0x60, 0x6C };
+ u8 ASupRateLen = sizeof(ASupRate) / sizeof(u8);
MLME_JOIN_REQ_STRUCT *pInfo = (MLME_JOIN_REQ_STRUCT *) (Elem->Msg);
DBGPRINT(RT_DEBUG_TRACE,
@@ -409,7 +409,7 @@ VOID MlmeJoinReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
END_OF_ARGS);
if (ExtRateLen) {
- ULONG Tmp;
+ unsigned long Tmp;
MakeOutgoingFrame(pOutBuffer + FrameLen, &Tmp,
1, &ExtRateIe,
1, &ExtRateLen,
@@ -437,17 +437,17 @@ VOID MlmeJoinReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
MLME START Request state machine procedure, starting an IBSS
==========================================================================
*/
-VOID MlmeStartReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void MlmeStartReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Ssid[MAX_LEN_OF_SSID], SsidLen;
+ u8 Ssid[MAX_LEN_OF_SSID], SsidLen;
BOOLEAN TimerCancelled;
/* New for WPA security suites */
- UCHAR VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
+ u8 VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
NDIS_802_11_VARIABLE_IEs *pVIE = NULL;
LARGE_INTEGER TimeStamp;
BOOLEAN Privacy;
- USHORT Status;
+ u16 Status;
/* Init Variable IE structure */
pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE;
@@ -456,7 +456,7 @@ VOID MlmeStartReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
TimeStamp.u.HighPart = 0;
if (MlmeStartReqSanity
- (pAd, Elem->Msg, Elem->MsgLen, (PCHAR) Ssid, &SsidLen)) {
+ (pAd, Elem->Msg, Elem->MsgLen, (char *)Ssid, &SsidLen)) {
/* reset all the timers */
RTMPCancelTimer(&pAd->MlmeAux.ScanTimer, &TimerCancelled);
RTMPCancelTimer(&pAd->MlmeAux.BeaconTimer, &TimerCancelled);
@@ -550,33 +550,33 @@ VOID MlmeStartReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
peer sends beacon back when scanning
==========================================================================
*/
-VOID PeerBeaconAtScanAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerBeaconAtScanAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Bssid[MAC_ADDR_LEN], Addr2[MAC_ADDR_LEN];
- UCHAR Ssid[MAX_LEN_OF_SSID], BssType, Channel, NewChannel,
+ u8 Bssid[MAC_ADDR_LEN], Addr2[MAC_ADDR_LEN];
+ u8 Ssid[MAX_LEN_OF_SSID], BssType, Channel, NewChannel,
SsidLen, DtimCount, DtimPeriod, BcastFlag, MessageToMe;
CF_PARM CfParm;
- USHORT BeaconPeriod, AtimWin, CapabilityInfo;
+ u16 BeaconPeriod, AtimWin, CapabilityInfo;
PFRAME_802_11 pFrame;
LARGE_INTEGER TimeStamp;
- UCHAR Erp;
- UCHAR SupRate[MAX_LEN_OF_SUPPORTED_RATES],
+ u8 Erp;
+ u8 SupRate[MAX_LEN_OF_SUPPORTED_RATES],
ExtRate[MAX_LEN_OF_SUPPORTED_RATES];
- UCHAR SupRateLen, ExtRateLen;
- USHORT LenVIE;
- UCHAR CkipFlag;
- UCHAR AironetCellPowerLimit;
+ u8 SupRateLen, ExtRateLen;
+ u16 LenVIE;
+ u8 CkipFlag;
+ u8 AironetCellPowerLimit;
EDCA_PARM EdcaParm;
QBSS_LOAD_PARM QbssLoad;
QOS_CAPABILITY_PARM QosCapability;
- ULONG RalinkIe;
- UCHAR VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
+ unsigned long RalinkIe;
+ u8 VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
NDIS_802_11_VARIABLE_IEs *pVIE = NULL;
HT_CAPABILITY_IE HtCapability;
ADD_HT_INFO_IE AddHtInfo; /* AP might use this additional ht info IE */
- UCHAR HtCapabilityLen = 0, PreNHtCapabilityLen = 0;
- UCHAR AddHtInfoLen;
- UCHAR NewExtChannelOffset = 0xff;
+ u8 HtCapabilityLen = 0, PreNHtCapabilityLen = 0;
+ u8 AddHtInfoLen;
+ u8 NewExtChannelOffset = 0xff;
/* NdisFillMemory(Ssid, MAX_LEN_OF_SSID, 0x00); */
pFrame = (PFRAME_802_11) Elem->Msg;
@@ -593,7 +593,7 @@ VOID PeerBeaconAtScanAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Elem->Channel,
Addr2,
Bssid,
- (PCHAR) Ssid,
+ (char *)Ssid,
&SsidLen,
&BssType,
&BeaconPeriod,
@@ -624,8 +624,8 @@ VOID PeerBeaconAtScanAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
&AddHtInfoLen,
&AddHtInfo,
&NewExtChannelOffset, &LenVIE, pVIE)) {
- ULONG Idx;
- CHAR Rssi = 0;
+ unsigned long Idx;
+ char Rssi = 0;
Idx = BssTableSearch(&pAd->ScanTab, Bssid, Channel);
if (Idx != BSS_NOT_FOUND)
@@ -640,7 +640,7 @@ VOID PeerBeaconAtScanAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
HtCapabilityLen = SIZE_HT_CAP_IE;
Idx =
- BssTableSetEntry(pAd, &pAd->ScanTab, Bssid, (PCHAR) Ssid,
+ BssTableSetEntry(pAd, &pAd->ScanTab, Bssid, (char *)Ssid,
SsidLen, BssType, BeaconPeriod, &CfParm,
AtimWin, CapabilityInfo, SupRate,
SupRateLen, ExtRate, ExtRateLen,
@@ -668,36 +668,36 @@ VOID PeerBeaconAtScanAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
When waiting joining the (I)BSS, beacon received from external
==========================================================================
*/
-VOID PeerBeaconAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerBeaconAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Bssid[MAC_ADDR_LEN], Addr2[MAC_ADDR_LEN];
- UCHAR Ssid[MAX_LEN_OF_SSID], SsidLen, BssType, Channel, MessageToMe,
+ u8 Bssid[MAC_ADDR_LEN], Addr2[MAC_ADDR_LEN];
+ u8 Ssid[MAX_LEN_OF_SSID], SsidLen, BssType, Channel, MessageToMe,
DtimCount, DtimPeriod, BcastFlag, NewChannel;
LARGE_INTEGER TimeStamp;
- USHORT BeaconPeriod, AtimWin, CapabilityInfo;
+ u16 BeaconPeriod, AtimWin, CapabilityInfo;
CF_PARM Cf;
BOOLEAN TimerCancelled;
- UCHAR Erp;
- UCHAR SupRate[MAX_LEN_OF_SUPPORTED_RATES],
+ u8 Erp;
+ u8 SupRate[MAX_LEN_OF_SUPPORTED_RATES],
ExtRate[MAX_LEN_OF_SUPPORTED_RATES];
- UCHAR SupRateLen, ExtRateLen;
- UCHAR CkipFlag;
- USHORT LenVIE;
- UCHAR AironetCellPowerLimit;
+ u8 SupRateLen, ExtRateLen;
+ u8 CkipFlag;
+ u16 LenVIE;
+ u8 AironetCellPowerLimit;
EDCA_PARM EdcaParm;
QBSS_LOAD_PARM QbssLoad;
QOS_CAPABILITY_PARM QosCapability;
- USHORT Status;
- UCHAR VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
+ u16 Status;
+ u8 VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
NDIS_802_11_VARIABLE_IEs *pVIE = NULL;
- ULONG RalinkIe;
- ULONG Idx;
+ unsigned long RalinkIe;
+ unsigned long Idx;
HT_CAPABILITY_IE HtCapability;
ADD_HT_INFO_IE AddHtInfo; /* AP might use this additional ht info IE */
- UCHAR HtCapabilityLen = 0, PreNHtCapabilityLen = 0;
- UCHAR AddHtInfoLen;
- UCHAR NewExtChannelOffset = 0xff;
- UCHAR CentralChannel;
+ u8 HtCapabilityLen = 0, PreNHtCapabilityLen = 0;
+ u8 AddHtInfoLen;
+ u8 NewExtChannelOffset = 0xff;
+ u8 CentralChannel;
BOOLEAN bAllowNrate = FALSE;
/* Init Variable IE structure */
@@ -712,7 +712,7 @@ VOID PeerBeaconAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Elem->Channel,
Addr2,
Bssid,
- (PCHAR) Ssid,
+ (char *)Ssid,
&SsidLen,
&BssType,
&BeaconPeriod,
@@ -798,7 +798,7 @@ VOID PeerBeaconAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Channel);
if (Idx == BSS_NOT_FOUND) {
- CHAR Rssi = 0;
+ char Rssi = 0;
Rssi =
RTMPMaxRssi(pAd,
ConvertToRssi(pAd,
@@ -816,7 +816,7 @@ VOID PeerBeaconAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Idx =
BssTableSetEntry(pAd, &pAd->ScanTab,
Bssid,
- (CHAR *) Ssid,
+ (char *) Ssid,
SsidLen, BssType,
BeaconPeriod, &Cf,
AtimWin,
@@ -1041,35 +1041,35 @@ VOID PeerBeaconAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Bssid[MAC_ADDR_LEN], Addr2[MAC_ADDR_LEN];
- CHAR Ssid[MAX_LEN_OF_SSID];
+ u8 Bssid[MAC_ADDR_LEN], Addr2[MAC_ADDR_LEN];
+ char Ssid[MAX_LEN_OF_SSID];
CF_PARM CfParm;
- UCHAR SsidLen, MessageToMe = 0, BssType, Channel, NewChannel, index = 0;
- UCHAR DtimCount = 0, DtimPeriod = 0, BcastFlag = 0;
- USHORT CapabilityInfo, AtimWin, BeaconPeriod;
+ u8 SsidLen, MessageToMe = 0, BssType, Channel, NewChannel, index = 0;
+ u8 DtimCount = 0, DtimPeriod = 0, BcastFlag = 0;
+ u16 CapabilityInfo, AtimWin, BeaconPeriod;
LARGE_INTEGER TimeStamp;
- USHORT TbttNumToNextWakeUp;
- UCHAR Erp;
- UCHAR SupRate[MAX_LEN_OF_SUPPORTED_RATES],
+ u16 TbttNumToNextWakeUp;
+ u8 Erp;
+ u8 SupRate[MAX_LEN_OF_SUPPORTED_RATES],
ExtRate[MAX_LEN_OF_SUPPORTED_RATES];
- UCHAR SupRateLen, ExtRateLen;
- UCHAR CkipFlag;
- USHORT LenVIE;
- UCHAR AironetCellPowerLimit;
+ u8 SupRateLen, ExtRateLen;
+ u8 CkipFlag;
+ u16 LenVIE;
+ u8 AironetCellPowerLimit;
EDCA_PARM EdcaParm;
QBSS_LOAD_PARM QbssLoad;
QOS_CAPABILITY_PARM QosCapability;
- ULONG RalinkIe;
+ unsigned long RalinkIe;
/* New for WPA security suites */
- UCHAR VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
+ u8 VarIE[MAX_VIE_LEN]; /* Total VIE length = MAX_VIE_LEN - -5 */
NDIS_802_11_VARIABLE_IEs *pVIE = NULL;
HT_CAPABILITY_IE HtCapability;
ADD_HT_INFO_IE AddHtInfo; /* AP might use this additional ht info IE */
- UCHAR HtCapabilityLen, PreNHtCapabilityLen;
- UCHAR AddHtInfoLen;
- UCHAR NewExtChannelOffset = 0xff;
+ u8 HtCapabilityLen, PreNHtCapabilityLen;
+ u8 AddHtInfoLen;
+ u8 NewExtChannelOffset = 0xff;
if (!(INFRA_ON(pAd) || ADHOC_ON(pAd)
))
@@ -1119,9 +1119,9 @@ VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
&AddHtInfo,
&NewExtChannelOffset, &LenVIE, pVIE)) {
BOOLEAN is_my_bssid, is_my_ssid;
- ULONG Bssidx, Now;
+ unsigned long Bssidx, Now;
BSS_ENTRY *pBss;
- CHAR RealRssi =
+ char RealRssi =
RTMPMaxRssi(pAd, ConvertToRssi(pAd, Elem->Rssi0, RSSI_0),
ConvertToRssi(pAd, Elem->Rssi1, RSSI_1),
ConvertToRssi(pAd, Elem->Rssi2, RSSI_2));
@@ -1214,7 +1214,7 @@ VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* if the ssid matched & bssid unmatched, we should select the bssid with large value. */
/* This might happened when two STA start at the same time */
if ((!is_my_bssid) && ADHOC_ON(pAd)) {
- INT i;
+ int i;
/* Add the safeguard against the mismatch of adhoc wep status */
if (pAd->StaCfg.WepStatus !=
@@ -1279,8 +1279,8 @@ VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
}
if (ADHOC_ON(pAd) && (CAP_IS_IBSS_ON(CapabilityInfo))) {
- UCHAR MaxSupportedRateIn500Kbps = 0;
- UCHAR idx;
+ u8 MaxSupportedRateIn500Kbps = 0;
+ u8 idx;
MAC_TABLE_ENTRY *pEntry;
/* supported rates array may not be sorted. sort it and find the maximum rate */
@@ -1516,7 +1516,7 @@ VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
MlmeSetTxPreamble(pAd,
Rt802_11PreambleLong);
DBGPRINT(RT_DEBUG_TRACE,
- ("SYNC - AP forced to use LONG preamble\n"));
+ ("SYNC - AP forced to use long preamble\n"));
}
if (OPSTATUS_TEST_FLAG
@@ -1543,7 +1543,7 @@ VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* only INFRASTRUCTURE mode support power-saving feature */
if ((INFRA_ON(pAd) && (pAd->StaCfg.Psm == PWR_SAVE))
|| (pAd->CommonCfg.bAPSDForcePowerSave)) {
- UCHAR FreeNumber;
+ u8 FreeNumber;
/* 1. AP has backlogged unicast-to-me frame, stay AWAKE, send PSPOLL */
/* 2. AP has backlogged broadcast/multicast frame and we want those frames, stay AWAKE */
/* 3. we have outgoing frames in TxRing or MgmtRing, better stay AWAKE */
@@ -1660,7 +1660,7 @@ VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
due to MaxSPLength.
*/
} else {
- USHORT NextDtim = DtimCount;
+ u16 NextDtim = DtimCount;
if (NextDtim == 0)
NextDtim = DtimPeriod;
@@ -1703,22 +1703,22 @@ VOID PeerBeacon(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Receive PROBE REQ from remote peer when operating in IBSS mode
==========================================================================
*/
-VOID PeerProbeReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void PeerProbeReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- UCHAR Addr2[MAC_ADDR_LEN];
- CHAR Ssid[MAX_LEN_OF_SSID];
- UCHAR SsidLen;
- UCHAR HtLen, AddHtLen, NewExtLen;
+ u8 Addr2[MAC_ADDR_LEN];
+ char Ssid[MAX_LEN_OF_SSID];
+ u8 SsidLen;
+ u8 HtLen, AddHtLen, NewExtLen;
HEADER_802_11 ProbeRspHdr;
- NDIS_STATUS NStatus;
- PUCHAR pOutBuffer = NULL;
- ULONG FrameLen = 0;
+ int NStatus;
+ u8 *pOutBuffer = NULL;
+ unsigned long FrameLen = 0;
LARGE_INTEGER FakeTimestamp;
- UCHAR DsLen = 1, IbssLen = 2;
- UCHAR LocalErpIe[3] = { IE_ERP, 1, 0 };
+ u8 DsLen = 1, IbssLen = 2;
+ u8 LocalErpIe[3] = { IE_ERP, 1, 0 };
BOOLEAN Privacy;
- USHORT CapabilityInfo;
- UCHAR RSNIe = IE_WPA;
+ u16 CapabilityInfo;
+ u8 RSNIe = IE_WPA;
if (!ADHOC_ON(pAd))
return;
@@ -1764,7 +1764,7 @@ VOID PeerProbeReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
&pAd->StaActive.AtimWin, END_OF_ARGS);
if (pAd->StaActive.ExtRateLen) {
- ULONG tmp;
+ unsigned long tmp;
MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
3, LocalErpIe,
1, &ExtRateIe,
@@ -1776,7 +1776,7 @@ VOID PeerProbeReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
}
/* If adhoc secruity is set for WPA-None, append the cipher suite IE */
if (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPANone) {
- ULONG tmp;
+ unsigned long tmp;
MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
1, &RSNIe,
1, &pAd->StaCfg.RSNIE_Len,
@@ -1787,8 +1787,8 @@ VOID PeerProbeReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
}
if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) {
- ULONG TmpLen;
- UCHAR BROADCOM[4] = { 0x0, 0x90, 0x4c, 0x33 };
+ unsigned long TmpLen;
+ u8 BROADCOM[4] = { 0x0, 0x90, 0x4c, 0x33 };
HtLen = sizeof(pAd->CommonCfg.HtCapability);
AddHtLen = sizeof(pAd->CommonCfg.AddHTInfo);
NewExtLen = 1;
@@ -1833,9 +1833,9 @@ VOID PeerProbeReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
}
}
-VOID BeaconTimeoutAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void BeaconTimeoutAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE, ("SYNC - BeaconTimeoutAtJoinAction\n"));
pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
Status = MLME_REJ_TIMEOUT;
@@ -1848,7 +1848,7 @@ VOID BeaconTimeoutAtJoinAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Scan timeout procedure. basically add channel index by 1 and rescan
==========================================================================
*/
-VOID ScanTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void ScanTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
pAd->MlmeAux.Channel = NextChannel(pAd, pAd->MlmeAux.Channel);
@@ -1868,9 +1868,9 @@ VOID ScanTimeoutAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Description:
==========================================================================
*/
-VOID InvalidStateWhenScan(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void InvalidStateWhenScan(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE,
("AYNC - InvalidStateWhenScan(state=%ld). Reset SYNC machine\n",
pAd->Mlme.SyncMachine.CurrState));
@@ -1884,9 +1884,9 @@ VOID InvalidStateWhenScan(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Description:
==========================================================================
*/
-VOID InvalidStateWhenJoin(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void InvalidStateWhenJoin(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE,
("InvalidStateWhenJoin(state=%ld). Reset SYNC machine\n",
pAd->Mlme.SyncMachine.CurrState));
@@ -1900,9 +1900,9 @@ VOID InvalidStateWhenJoin(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Description:
==========================================================================
*/
-VOID InvalidStateWhenStart(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void InvalidStateWhenStart(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- USHORT Status;
+ u16 Status;
DBGPRINT(RT_DEBUG_TRACE,
("InvalidStateWhenStart(state=%ld). Reset SYNC machine\n",
pAd->Mlme.SyncMachine.CurrState));
@@ -1919,12 +1919,12 @@ VOID InvalidStateWhenStart(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
==========================================================================
*/
-VOID EnqueuePsPoll(IN PRTMP_ADAPTER pAd)
+void EnqueuePsPoll(IN PRTMP_ADAPTER pAd)
{
if (pAd->StaCfg.WindowsPowerMode == Ndis802_11PowerModeLegacy_PSP)
pAd->PsPollFrame.FC.PwrMgmt = PWR_SAVE;
- MiniportMMRequest(pAd, 0, (PUCHAR) & pAd->PsPollFrame,
+ MiniportMMRequest(pAd, 0, (u8 *)& pAd->PsPollFrame,
sizeof(PSPOLL_FRAME));
}
@@ -1933,11 +1933,11 @@ VOID EnqueuePsPoll(IN PRTMP_ADAPTER pAd)
Description:
==========================================================================
*/
-VOID EnqueueProbeRequest(IN PRTMP_ADAPTER pAd)
+void EnqueueProbeRequest(IN PRTMP_ADAPTER pAd)
{
- NDIS_STATUS NState;
- PUCHAR pOutBuffer;
- ULONG FrameLen = 0;
+ int NState;
+ u8 *pOutBuffer;
+ unsigned long FrameLen = 0;
HEADER_802_11 Hdr80211;
DBGPRINT(RT_DEBUG_TRACE, ("force out a ProbeRequest ...\n"));
diff --git a/drivers/staging/rt2860/sta/wpa.c b/drivers/staging/rt2860/sta/wpa.c
index 15ed01e5efb0..abc730b6565f 100644
--- a/drivers/staging/rt2860/sta/wpa.c
+++ b/drivers/staging/rt2860/sta/wpa.c
@@ -37,7 +37,7 @@
*/
#include "../rt_config.h"
-void inc_byte_array(UCHAR * counter, int len);
+void inc_byte_array(u8 * counter, int len);
/*
========================================================================
@@ -58,10 +58,10 @@ void inc_byte_array(UCHAR * counter, int len);
========================================================================
*/
-VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
+void RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
{
- ULONG Now;
- UCHAR unicastKey = (pWpaKey->Type == PAIRWISE_KEY ? 1 : 0);
+ unsigned long Now;
+ u8 unicastKey = (pWpaKey->Type == PAIRWISE_KEY ? 1 : 0);
/* Record Last MIC error time and count */
NdisGetSystemUpTime(&Now);
@@ -113,12 +113,12 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
#define LENGTH_EAP_H 4
/* If the received frame is EAP-Packet ,find out its EAP-Code (Request(0x01), Response(0x02), Success(0x03), Failure(0x04)). */
-INT WpaCheckEapCode(IN PRTMP_ADAPTER pAd,
- IN PUCHAR pFrame, IN USHORT FrameLen, IN USHORT OffSet)
+int WpaCheckEapCode(IN PRTMP_ADAPTER pAd,
+ u8 *pFrame, u16 FrameLen, u16 OffSet)
{
- PUCHAR pData;
- INT result = 0;
+ u8 *pData;
+ int result = 0;
if (FrameLen < OffSet + LENGTH_EAPOL_H + LENGTH_EAP_H)
return result;
@@ -133,7 +133,7 @@ INT WpaCheckEapCode(IN PRTMP_ADAPTER pAd,
return result;
}
-VOID WpaSendMicFailureToWpaSupplicant(IN PRTMP_ADAPTER pAd, IN BOOLEAN bUnicast)
+void WpaSendMicFailureToWpaSupplicant(IN PRTMP_ADAPTER pAd, IN BOOLEAN bUnicast)
{
char custom[IW_CUSTOM_MAX] = { 0 };
@@ -141,19 +141,19 @@ VOID WpaSendMicFailureToWpaSupplicant(IN PRTMP_ADAPTER pAd, IN BOOLEAN bUnicast)
if (bUnicast)
sprintf(custom, "%s unicast", custom);
- RtmpOSWrielessEventSend(pAd, IWEVCUSTOM, -1, NULL, (PUCHAR) custom,
+ RtmpOSWrielessEventSend(pAd, IWEVCUSTOM, -1, NULL, (u8 *)custom,
strlen(custom));
return;
}
-VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
+void WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
{
- PUCHAR pOutBuffer = NULL;
- UCHAR Header802_3[14];
- ULONG FrameLen = 0;
+ u8 *pOutBuffer = NULL;
+ u8 Header802_3[14];
+ unsigned long FrameLen = 0;
EAPOL_PACKET Packet;
- UCHAR Mic[16];
+ u8 Mic[16];
BOOLEAN bUnicast;
DBGPRINT(RT_DEBUG_TRACE, ("WpaMicFailureReportFrame ----->\n"));
@@ -190,30 +190,30 @@ VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Packet.KeyDesc.KeyInfo.Error = 1;
/* Update packet length after decide Key data payload */
- SET_UINT16_TO_ARRARY(Packet.Body_Len, LEN_EAPOL_KEY_MSG)
+ SET_u16_TO_ARRARY(Packet.Body_Len, LEN_EAPOL_KEY_MSG)
/* Key Replay Count */
NdisMoveMemory(Packet.KeyDesc.ReplayCounter,
pAd->StaCfg.ReplayCounter, LEN_KEY_DESC_REPLAY);
inc_byte_array(pAd->StaCfg.ReplayCounter, 8);
/* Convert to little-endian format. */
- *((USHORT *) & Packet.KeyDesc.KeyInfo) =
- cpu2le16(*((USHORT *) & Packet.KeyDesc.KeyInfo));
+ *((u16 *) & Packet.KeyDesc.KeyInfo) =
+ cpu2le16(*((u16 *) & Packet.KeyDesc.KeyInfo));
- MlmeAllocateMemory(pAd, (PUCHAR *) & pOutBuffer); /* allocate memory */
+ MlmeAllocateMemory(pAd, (u8 **) & pOutBuffer); /* allocate memory */
if (pOutBuffer == NULL) {
return;
}
/* Prepare EAPOL frame for MIC calculation */
/* Be careful, only EAPOL frame is counted for MIC calculation */
MakeOutgoingFrame(pOutBuffer, &FrameLen,
- CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, &Packet,
+ CONV_ARRARY_TO_u16(Packet.Body_Len) + 4, &Packet,
END_OF_ARGS);
/* Prepare and Fill MIC value */
NdisZeroMemory(Mic, sizeof(Mic));
if (pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) { /* AES */
- UCHAR digest[20] = { 0 };
+ u8 digest[20] = { 0 };
HMAC_SHA1(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen,
digest, SHA1_DIGEST_SIZE);
NdisMoveMemory(Mic, digest, LEN_KEY_DESC_MIC);
@@ -226,10 +226,10 @@ VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
/* copy frame to Tx ring and send MIC failure report frame to authenticator */
RTMPToWirelessSta(pAd, &pAd->MacTab.Content[BSSID_WCID],
Header802_3, LENGTH_802_3,
- (PUCHAR) & Packet,
- CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, FALSE);
+ (u8 *)& Packet,
+ CONV_ARRARY_TO_u16(Packet.Body_Len) + 4, FALSE);
- MlmeFreeMemory(pAd, (PUCHAR) pOutBuffer);
+ MlmeFreeMemory(pAd, (u8 *)pOutBuffer);
DBGPRINT(RT_DEBUG_TRACE, ("WpaMicFailureReportFrame <-----\n"));
}
@@ -243,7 +243,7 @@ VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
* rolling over to more significant bytes if the byte was incremented from
* 0xff to 0x00.
*/
-void inc_byte_array(UCHAR * counter, int len)
+void inc_byte_array(u8 * counter, int len)
{
int pos = len - 1;
while (pos >= 0) {
@@ -254,10 +254,10 @@ void inc_byte_array(UCHAR * counter, int len)
}
}
-VOID WpaDisassocApAndBlockAssoc(IN PVOID SystemSpecific1,
- IN PVOID FunctionContext,
- IN PVOID SystemSpecific2,
- IN PVOID SystemSpecific3)
+void WpaDisassocApAndBlockAssoc(void *SystemSpecific1,
+ void *FunctionContext,
+ void *SystemSpecific2,
+ void *SystemSpecific3)
{
RTMP_ADAPTER *pAd = (PRTMP_ADAPTER) FunctionContext;
MLME_DISASSOC_REQ_STRUCT DisassocReq;
@@ -274,7 +274,7 @@ VOID WpaDisassocApAndBlockAssoc(IN PVOID SystemSpecific1,
pAd->StaCfg.bBlockAssoc = TRUE;
}
-VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
+void WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
{
PCIPHER_KEY pSharedKey;
PMAC_TABLE_ENTRY pEntry;
@@ -330,7 +330,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
}
-VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd)
+void WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd)
{
PCIPHER_KEY pSharedKey;
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-15 04:26:41 +0200