|
@@ -222,13 +222,13 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf,
|
|
|
|
|
|
if (pTransmitKey->byCipherSuite == KEY_CTL_WEP) {
|
|
|
if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN ){
|
|
|
- memcpy(pDevice->abyPRNG, (PBYTE)&(dwRevIVCounter), 3);
|
|
|
+ memcpy(pDevice->abyPRNG, (u8 *)&(dwRevIVCounter), 3);
|
|
|
memcpy(pDevice->abyPRNG+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength);
|
|
|
} else {
|
|
|
- memcpy(pbyBuf, (PBYTE)&(dwRevIVCounter), 3);
|
|
|
+ memcpy(pbyBuf, (u8 *)&(dwRevIVCounter), 3);
|
|
|
memcpy(pbyBuf+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength);
|
|
|
if(pTransmitKey->uKeyLength == WLAN_WEP40_KEYLEN) {
|
|
|
- memcpy(pbyBuf+8, (PBYTE)&(dwRevIVCounter), 3);
|
|
|
+ memcpy(pbyBuf+8, (u8 *)&(dwRevIVCounter), 3);
|
|
|
memcpy(pbyBuf+11, pTransmitKey->abyKey, pTransmitKey->uKeyLength);
|
|
|
}
|
|
|
memcpy(pDevice->abyPRNG, pbyBuf, 16);
|
|
@@ -252,7 +252,7 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf,
|
|
|
// Make IV
|
|
|
memcpy(pdwIV, pDevice->abyPRNG, 3);
|
|
|
|
|
|
- *(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
|
|
|
+ *(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
|
|
|
// Append IV&ExtIV after Mac Header
|
|
|
*pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %x\n",
|
|
@@ -267,33 +267,33 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf,
|
|
|
|
|
|
// Make IV
|
|
|
*pdwIV = 0;
|
|
|
- *(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
|
|
|
+ *(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
|
|
|
*pdwIV |= cpu_to_le16((WORD)(pTransmitKey->wTSC15_0));
|
|
|
//Append IV&ExtIV after Mac Header
|
|
|
*pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);
|
|
|
|
|
|
//Fill MICHDR0
|
|
|
*pMICHDR = 0x59;
|
|
|
- *((PBYTE)(pMICHDR+1)) = 0; // TxPriority
|
|
|
+ *((u8 *)(pMICHDR+1)) = 0; // TxPriority
|
|
|
memcpy(pMICHDR+2, &(pMACHeader->abyAddr2[0]), 6);
|
|
|
- *((PBYTE)(pMICHDR+8)) = HIBYTE(HIWORD(pTransmitKey->dwTSC47_16));
|
|
|
- *((PBYTE)(pMICHDR+9)) = LOBYTE(HIWORD(pTransmitKey->dwTSC47_16));
|
|
|
- *((PBYTE)(pMICHDR+10)) = HIBYTE(LOWORD(pTransmitKey->dwTSC47_16));
|
|
|
- *((PBYTE)(pMICHDR+11)) = LOBYTE(LOWORD(pTransmitKey->dwTSC47_16));
|
|
|
- *((PBYTE)(pMICHDR+12)) = HIBYTE(pTransmitKey->wTSC15_0);
|
|
|
- *((PBYTE)(pMICHDR+13)) = LOBYTE(pTransmitKey->wTSC15_0);
|
|
|
- *((PBYTE)(pMICHDR+14)) = HIBYTE(wPayloadLen);
|
|
|
- *((PBYTE)(pMICHDR+15)) = LOBYTE(wPayloadLen);
|
|
|
+ *((u8 *)(pMICHDR+8)) = HIBYTE(HIWORD(pTransmitKey->dwTSC47_16));
|
|
|
+ *((u8 *)(pMICHDR+9)) = LOBYTE(HIWORD(pTransmitKey->dwTSC47_16));
|
|
|
+ *((u8 *)(pMICHDR+10)) = HIBYTE(LOWORD(pTransmitKey->dwTSC47_16));
|
|
|
+ *((u8 *)(pMICHDR+11)) = LOBYTE(LOWORD(pTransmitKey->dwTSC47_16));
|
|
|
+ *((u8 *)(pMICHDR+12)) = HIBYTE(pTransmitKey->wTSC15_0);
|
|
|
+ *((u8 *)(pMICHDR+13)) = LOBYTE(pTransmitKey->wTSC15_0);
|
|
|
+ *((u8 *)(pMICHDR+14)) = HIBYTE(wPayloadLen);
|
|
|
+ *((u8 *)(pMICHDR+15)) = LOBYTE(wPayloadLen);
|
|
|
|
|
|
//Fill MICHDR1
|
|
|
- *((PBYTE)(pMICHDR+16)) = 0; // HLEN[15:8]
|
|
|
+ *((u8 *)(pMICHDR+16)) = 0; // HLEN[15:8]
|
|
|
if (pDevice->bLongHeader) {
|
|
|
- *((PBYTE)(pMICHDR+17)) = 28; // HLEN[7:0]
|
|
|
+ *((u8 *)(pMICHDR+17)) = 28; // HLEN[7:0]
|
|
|
} else {
|
|
|
- *((PBYTE)(pMICHDR+17)) = 22; // HLEN[7:0]
|
|
|
+ *((u8 *)(pMICHDR+17)) = 22; // HLEN[7:0]
|
|
|
}
|
|
|
wValue = cpu_to_le16(pMACHeader->wFrameCtl & 0xC78F);
|
|
|
- memcpy(pMICHDR+18, (PBYTE)&wValue, 2); // MSKFRACTL
|
|
|
+ memcpy(pMICHDR+18, (u8 *)&wValue, 2); // MSKFRACTL
|
|
|
memcpy(pMICHDR+20, &(pMACHeader->abyAddr1[0]), 6);
|
|
|
memcpy(pMICHDR+26, &(pMACHeader->abyAddr2[0]), 6);
|
|
|
|
|
@@ -302,7 +302,7 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf,
|
|
|
wValue = pMACHeader->wSeqCtl;
|
|
|
wValue &= 0x000F;
|
|
|
wValue = cpu_to_le16(wValue);
|
|
|
- memcpy(pMICHDR+38, (PBYTE)&wValue, 2); // MSKSEQCTL
|
|
|
+ memcpy(pMICHDR+38, (u8 *)&wValue, 2); // MSKSEQCTL
|
|
|
if (pDevice->bLongHeader) {
|
|
|
memcpy(pMICHDR+40, &(pMACHeader->abyAddr4[0]), 6);
|
|
|
}
|
|
@@ -671,7 +671,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
|
|
|
PSTxDataHead_ab pBuf = (PSTxDataHead_ab) pTxDataHead;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
|
|
|
- (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
|
|
|
);
|
|
|
//Get Duration and TimeStampOff
|
|
|
pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
|
|
@@ -688,10 +688,10 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
|
|
|
PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
|
|
|
- (PWORD)&(pBuf->wTransmitLength_a), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength_a), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a)
|
|
|
);
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(pBuf->wTransmitLength_b), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength_b), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
|
|
|
);
|
|
|
//Get Duration and TimeStamp
|
|
|
pBuf->wDuration_a = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength,
|
|
@@ -711,10 +711,10 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
|
|
|
PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
|
|
|
- (PWORD)&(pBuf->wTransmitLength_a), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength_a), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a)
|
|
|
);
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(pBuf->wTransmitLength_b), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength_b), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
|
|
|
);
|
|
|
//Get Duration and TimeStamp
|
|
|
pBuf->wDuration_a = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
|
|
@@ -737,7 +737,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
|
|
|
PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
|
|
|
- (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
|
|
|
);
|
|
|
//Get Duration and TimeStampOff
|
|
|
pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
|
|
@@ -754,7 +754,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
|
|
|
PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
|
|
|
- (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
|
|
|
);
|
|
|
//Get Duration and TimeStampOff
|
|
|
pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
|
|
@@ -772,7 +772,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice,
|
|
|
PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
|
|
|
- (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
|
|
|
+ (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
|
|
|
);
|
|
|
//Get Duration and TimeStampOff
|
|
|
pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType,
|
|
@@ -810,11 +810,11 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
|
|
|
PSRTS_g pBuf = (PSRTS_g)pvRTS;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
|
|
|
);
|
|
|
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
|
|
|
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a)
|
|
|
);
|
|
|
pBuf->wTransmitLength_a = cpu_to_le16(wLen);
|
|
|
//Get Duration
|
|
@@ -852,11 +852,11 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
|
|
|
PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
|
|
|
);
|
|
|
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
|
|
|
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a)
|
|
|
);
|
|
|
pBuf->wTransmitLength_a = cpu_to_le16(wLen);
|
|
|
//Get Duration
|
|
@@ -901,7 +901,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
|
|
|
PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
|
|
|
);
|
|
|
pBuf->wTransmitLength = cpu_to_le16(wLen);
|
|
|
//Get Duration
|
|
@@ -936,7 +936,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
|
|
|
PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
|
|
|
);
|
|
|
pBuf->wTransmitLength = cpu_to_le16(wLen);
|
|
|
//Get Duration
|
|
@@ -972,7 +972,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
|
|
|
PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
|
|
|
);
|
|
|
pBuf->wTransmitLength = cpu_to_le16(wLen);
|
|
|
//Get Duration
|
|
@@ -1028,7 +1028,7 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx,
|
|
|
PSCTS_FB pBuf = (PSCTS_FB)pvCTS;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
|
|
|
);
|
|
|
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
|
|
|
pBuf->wDuration_ba = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data
|
|
@@ -1053,7 +1053,7 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx,
|
|
|
PSCTS pBuf = (PSCTS)pvCTS;
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
|
|
|
+ (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
|
|
|
);
|
|
|
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
|
|
|
//Get CTSDuration_ba
|
|
@@ -1195,7 +1195,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|
|
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter END.\n");
|
|
|
}
|
|
|
/*
|
|
|
- PBYTE pbyBuffer,//point to pTxBufHead
|
|
|
+ u8 * pbyBuffer,//point to pTxBufHead
|
|
|
WORD wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last
|
|
|
unsigned int cbFragmentSize,//Hdr+payoad+FCS
|
|
|
*/
|
|
@@ -1358,7 +1358,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
|
|
pTxBufHead->wFIFOCtl |= (FIFOCTL_RTS | FIFOCTL_LRETRY);
|
|
|
}
|
|
|
|
|
|
- pbyTxBufferAddr = (PBYTE) &(pTxBufHead->adwTxKey[0]);
|
|
|
+ pbyTxBufferAddr = (u8 *) &(pTxBufHead->adwTxKey[0]);
|
|
|
wTxBufSize = sizeof(STxBufHead);
|
|
|
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
|
|
|
if (byFBOption == AUTO_FB_NONE) {
|
|
@@ -1437,9 +1437,9 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
|
|
} // Auto Fall Back
|
|
|
}
|
|
|
|
|
|
- pbyMacHdr = (PBYTE)(pbyTxBufferAddr + cbHeaderLength);
|
|
|
- pbyIVHead = (PBYTE)(pbyMacHdr + cbMACHdLen + uPadding);
|
|
|
- pbyPayloadHead = (PBYTE)(pbyMacHdr + cbMACHdLen + uPadding + cbIVlen);
|
|
|
+ pbyMacHdr = (u8 *)(pbyTxBufferAddr + cbHeaderLength);
|
|
|
+ pbyIVHead = (u8 *)(pbyMacHdr + cbMACHdLen + uPadding);
|
|
|
+ pbyPayloadHead = (u8 *)(pbyMacHdr + cbMACHdLen + uPadding + cbIVlen);
|
|
|
|
|
|
|
|
|
//=========================
|
|
@@ -1464,8 +1464,8 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
|
|
|
|
|
if (bNeedEncryption == true) {
|
|
|
//Fill TXKEY
|
|
|
- s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey,
|
|
|
- pbyMacHdr, (WORD)cbFrameBodySize, (PBYTE)pMICHDR);
|
|
|
+ s_vFillTxKey(pDevice, (u8 *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey,
|
|
|
+ pbyMacHdr, (WORD)cbFrameBodySize, (u8 *)pMICHDR);
|
|
|
|
|
|
if (pDevice->bEnableHostWEP) {
|
|
|
pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16;
|
|
@@ -1478,15 +1478,15 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
|
|
if (pDevice->dwDiagRefCount == 0) {
|
|
|
if ((psEthHeader->wType == cpu_to_be16(ETH_P_IPX)) ||
|
|
|
(psEthHeader->wType == cpu_to_le16(0xF380))) {
|
|
|
- memcpy((PBYTE) (pbyPayloadHead),
|
|
|
+ memcpy((u8 *) (pbyPayloadHead),
|
|
|
abySNAP_Bridgetunnel, 6);
|
|
|
} else {
|
|
|
- memcpy((PBYTE) (pbyPayloadHead), &abySNAP_RFC1042[0], 6);
|
|
|
+ memcpy((u8 *) (pbyPayloadHead), &abySNAP_RFC1042[0], 6);
|
|
|
}
|
|
|
- pbyType = (PBYTE) (pbyPayloadHead + 6);
|
|
|
+ pbyType = (u8 *) (pbyPayloadHead + 6);
|
|
|
memcpy(pbyType, &(psEthHeader->wType), sizeof(WORD));
|
|
|
} else {
|
|
|
- memcpy((PBYTE) (pbyPayloadHead), &(psEthHeader->wType), sizeof(WORD));
|
|
|
+ memcpy((u8 *) (pbyPayloadHead), &(psEthHeader->wType), sizeof(WORD));
|
|
|
|
|
|
}
|
|
|
|
|
@@ -1502,7 +1502,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
|
|
|
|
|
} else {
|
|
|
// while bRelayPacketSend psEthHeader is point to header+payload
|
|
|
- memcpy((pbyPayloadHead + cb802_1_H_len), ((PBYTE)psEthHeader) + ETH_HLEN, uSkbPacketLen - ETH_HLEN);
|
|
|
+ memcpy((pbyPayloadHead + cb802_1_H_len), ((u8 *)psEthHeader) + ETH_HLEN, uSkbPacketLen - ETH_HLEN);
|
|
|
}
|
|
|
|
|
|
ASSERT(uLength == cbNdisBodySize);
|
|
@@ -1525,9 +1525,9 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
|
|
}
|
|
|
// DO Software Michael
|
|
|
MIC_vInit(dwMICKey0, dwMICKey1);
|
|
|
- MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12);
|
|
|
+ MIC_vAppend((u8 *)&(psEthHeader->abyDstAddr[0]), 12);
|
|
|
dwMIC_Priority = 0;
|
|
|
- MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
|
|
|
+ MIC_vAppend((u8 *)&dwMIC_Priority, 4);
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %X, %X\n",
|
|
|
dwMICKey0, dwMICKey1);
|
|
|
|
|
@@ -1535,7 +1535,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
|
|
|
|
|
//DBG_PRN_GRP12(("Length:%d, %d\n", cbFrameBodySize, uFromHDtoPLDLength));
|
|
|
//for (ii = 0; ii < cbFrameBodySize; ii++) {
|
|
|
- // DBG_PRN_GRP12(("%02x ", *((PBYTE)((pbyPayloadHead + cb802_1_H_len) + ii))));
|
|
|
+ // DBG_PRN_GRP12(("%02x ", *((u8 *)((pbyPayloadHead + cb802_1_H_len) + ii))));
|
|
|
//}
|
|
|
//DBG_PRN_GRP12(("\n\n\n"));
|
|
|
|
|
@@ -1740,7 +1740,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
|
|
|
}
|
|
|
|
|
|
pTX_Buffer = (PTX_BUFFER) (&pContext->Data[0]);
|
|
|
- pbyTxBufferAddr = (PBYTE)&(pTX_Buffer->adwTxKey[0]);
|
|
|
+ pbyTxBufferAddr = (u8 *)&(pTX_Buffer->adwTxKey[0]);
|
|
|
cbFrameBodySize = pPacket->cbPayloadLen;
|
|
|
pTxBufHead = (PSTxBufHead) pbyTxBufferAddr;
|
|
|
wTxBufSize = sizeof(STxBufHead);
|
|
@@ -1902,13 +1902,13 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
|
|
|
cbReqCount = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen + cbFrameBodySize;
|
|
|
|
|
|
if (WLAN_GET_FC_ISWEP(pPacket->p80211Header->sA4.wFrameCtl) != 0) {
|
|
|
- PBYTE pbyIVHead;
|
|
|
- PBYTE pbyPayloadHead;
|
|
|
- PBYTE pbyBSSID;
|
|
|
+ u8 * pbyIVHead;
|
|
|
+ u8 * pbyPayloadHead;
|
|
|
+ u8 * pbyBSSID;
|
|
|
PSKeyItem pTransmitKey = NULL;
|
|
|
|
|
|
- pbyIVHead = (PBYTE)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding);
|
|
|
- pbyPayloadHead = (PBYTE)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding + cbIVlen);
|
|
|
+ pbyIVHead = (u8 *)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding);
|
|
|
+ pbyPayloadHead = (u8 *)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding + cbIVlen);
|
|
|
do {
|
|
|
if ((pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) &&
|
|
|
(pDevice->bLinkPass == true)) {
|
|
@@ -1935,11 +1935,11 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
|
|
|
}
|
|
|
} while(false);
|
|
|
//Fill TXKEY
|
|
|
- s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey,
|
|
|
- (PBYTE)pMACHeader, (WORD)cbFrameBodySize, NULL);
|
|
|
+ s_vFillTxKey(pDevice, (u8 *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey,
|
|
|
+ (u8 *)pMACHeader, (WORD)cbFrameBodySize, NULL);
|
|
|
|
|
|
memcpy(pMACHeader, pPacket->p80211Header, cbMacHdLen);
|
|
|
- memcpy(pbyPayloadHead, ((PBYTE)(pPacket->p80211Header) + cbMacHdLen),
|
|
|
+ memcpy(pbyPayloadHead, ((u8 *)(pPacket->p80211Header) + cbMacHdLen),
|
|
|
cbFrameBodySize);
|
|
|
}
|
|
|
else {
|
|
@@ -1968,7 +1968,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
|
|
|
|
|
|
|
|
|
pTX_Buffer->wTxByteCount = cpu_to_le16((WORD)(cbReqCount));
|
|
|
- pTX_Buffer->byPKTNO = (BYTE) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
+ pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
pTX_Buffer->byType = 0x00;
|
|
|
|
|
|
pContext->pPacket = NULL;
|
|
@@ -1976,10 +1976,10 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
|
|
|
pContext->uBufLen = (WORD)cbReqCount + 4; //USB header
|
|
|
|
|
|
if (WLAN_GET_FC_TODS(pMACHeader->wFrameCtl) == 0) {
|
|
|
- s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
+ s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
}
|
|
|
else {
|
|
|
- s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
+ s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
}
|
|
|
|
|
|
PIPEnsSendBulkOut(pDevice,pContext);
|
|
@@ -2012,7 +2012,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
|
|
|
return status ;
|
|
|
}
|
|
|
pTX_Buffer = (PBEACON_BUFFER) (&pContext->Data[0]);
|
|
|
- pbyTxBufferAddr = (PBYTE)&(pTX_Buffer->wFIFOCtl);
|
|
|
+ pbyTxBufferAddr = (u8 *)&(pTX_Buffer->wFIFOCtl);
|
|
|
|
|
|
cbFrameBodySize = pPacket->cbPayloadLen;
|
|
|
|
|
@@ -2025,7 +2025,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
|
|
|
pTxDataHead = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize);
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameSize, wCurrentRate, PK_TYPE_11A,
|
|
|
- (PWORD)&(pTxDataHead->wTransmitLength), (PBYTE)&(pTxDataHead->byServiceField), (PBYTE)&(pTxDataHead->bySignalField)
|
|
|
+ (PWORD)&(pTxDataHead->wTransmitLength), (u8 *)&(pTxDataHead->byServiceField), (u8 *)&(pTxDataHead->bySignalField)
|
|
|
);
|
|
|
//Get Duration and TimeStampOff
|
|
|
pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameSize, PK_TYPE_11A,
|
|
@@ -2038,7 +2038,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
|
|
|
pTxDataHead = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize);
|
|
|
//Get SignalField,ServiceField,Length
|
|
|
BBvCalculateParameter(pDevice, cbFrameSize, wCurrentRate, PK_TYPE_11B,
|
|
|
- (PWORD)&(pTxDataHead->wTransmitLength), (PBYTE)&(pTxDataHead->byServiceField), (PBYTE)&(pTxDataHead->bySignalField)
|
|
|
+ (PWORD)&(pTxDataHead->wTransmitLength), (u8 *)&(pTxDataHead->byServiceField), (u8 *)&(pTxDataHead->bySignalField)
|
|
|
);
|
|
|
//Get Duration and TimeStampOff
|
|
|
pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameSize, PK_TYPE_11B,
|
|
@@ -2060,7 +2060,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
|
|
|
cbReqCount = cbHeaderSize + WLAN_HDR_ADDR3_LEN + cbFrameBodySize;
|
|
|
|
|
|
pTX_Buffer->wTxByteCount = (WORD)cbReqCount;
|
|
|
- pTX_Buffer->byPKTNO = (BYTE) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
+ pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
pTX_Buffer->byType = 0x01;
|
|
|
|
|
|
pContext->pPacket = NULL;
|
|
@@ -2126,7 +2126,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
|
|
}
|
|
|
|
|
|
pTX_Buffer = (PTX_BUFFER)(&pContext->Data[0]);
|
|
|
- pbyTxBufferAddr = (PBYTE)(&pTX_Buffer->adwTxKey[0]);
|
|
|
+ pbyTxBufferAddr = (u8 *)(&pTX_Buffer->adwTxKey[0]);
|
|
|
pTxBufHead = (PSTxBufHead) pbyTxBufferAddr;
|
|
|
wTxBufSize = sizeof(STxBufHead);
|
|
|
memset(pTxBufHead, 0, wTxBufSize);
|
|
@@ -2177,7 +2177,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
|
|
}
|
|
|
else {
|
|
|
if (pDevice->bEnableHostWEP) {
|
|
|
- if (BSSbIsSTAInNodeDB(pDevice, (PBYTE)(p80211Header->sA3.abyAddr1), &uNodeIndex))
|
|
|
+ if (BSSbIsSTAInNodeDB(pDevice, (u8 *)(p80211Header->sA3.abyAddr1), &uNodeIndex))
|
|
|
bNodeExist = true;
|
|
|
}
|
|
|
bNeedACK = true;
|
|
@@ -2314,9 +2314,9 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
|
|
|
|
|
cbReqCount = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen + (cbFrameBodySize + cbMIClen) + cbExtSuppRate;
|
|
|
|
|
|
- pbyMacHdr = (PBYTE)(pbyTxBufferAddr + cbHeaderSize);
|
|
|
- pbyPayloadHead = (PBYTE)(pbyMacHdr + cbMacHdLen + uPadding + cbIVlen);
|
|
|
- pbyIVHead = (PBYTE)(pbyMacHdr + cbMacHdLen + uPadding);
|
|
|
+ pbyMacHdr = (u8 *)(pbyTxBufferAddr + cbHeaderSize);
|
|
|
+ pbyPayloadHead = (u8 *)(pbyMacHdr + cbMacHdLen + uPadding + cbIVlen);
|
|
|
+ pbyIVHead = (u8 *)(pbyMacHdr + cbMacHdLen + uPadding);
|
|
|
|
|
|
// Copy the Packet into a tx Buffer
|
|
|
memcpy(pbyMacHdr, skb->data, cbMacHdLen);
|
|
@@ -2364,9 +2364,9 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
|
|
|
|
|
// DO Software Michael
|
|
|
MIC_vInit(dwMICKey0, dwMICKey1);
|
|
|
- MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12);
|
|
|
+ MIC_vAppend((u8 *)&(sEthHeader.abyDstAddr[0]), 12);
|
|
|
dwMIC_Priority = 0;
|
|
|
- MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
|
|
|
+ MIC_vAppend((u8 *)&dwMIC_Priority, 4);
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY:"\
|
|
|
" %X, %X\n", dwMICKey0, dwMICKey1);
|
|
|
|
|
@@ -2393,8 +2393,8 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
|
|
|
|
|
}
|
|
|
|
|
|
- s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey,
|
|
|
- pbyMacHdr, (WORD)cbFrameBodySize, (PBYTE)pMICHDR);
|
|
|
+ s_vFillTxKey(pDevice, (u8 *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey,
|
|
|
+ pbyMacHdr, (WORD)cbFrameBodySize, (u8 *)pMICHDR);
|
|
|
|
|
|
if (pDevice->bEnableHostWEP) {
|
|
|
pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16;
|
|
@@ -2427,7 +2427,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
|
|
}
|
|
|
|
|
|
pTX_Buffer->wTxByteCount = cpu_to_le16((WORD)(cbReqCount));
|
|
|
- pTX_Buffer->byPKTNO = (BYTE) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
+ pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
pTX_Buffer->byType = 0x00;
|
|
|
|
|
|
pContext->pPacket = skb;
|
|
@@ -2435,10 +2435,10 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
|
|
pContext->uBufLen = (WORD)cbReqCount + 4; //USB header
|
|
|
|
|
|
if (WLAN_GET_FC_TODS(pMACHeader->wFrameCtl) == 0) {
|
|
|
- s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
+ s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
}
|
|
|
else {
|
|
|
- s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
+ s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl);
|
|
|
}
|
|
|
PIPEnsSendBulkOut(pDevice,pContext);
|
|
|
return ;
|
|
@@ -2496,7 +2496,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- if (is_multicast_ether_addr((PBYTE)(skb->data))) {
|
|
|
+ if (is_multicast_ether_addr((u8 *)(skb->data))) {
|
|
|
uNodeIndex = 0;
|
|
|
bNodeExist = true;
|
|
|
if (pMgmt->sNodeDBTable[0].bPSEnable) {
|
|
@@ -2518,7 +2518,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
|
|
|
|
|
|
}else {
|
|
|
|
|
|
- if (BSSbIsSTAInNodeDB(pDevice, (PBYTE)(skb->data), &uNodeIndex)) {
|
|
|
+ if (BSSbIsSTAInNodeDB(pDevice, (u8 *)(skb->data), &uNodeIndex)) {
|
|
|
|
|
|
if (pMgmt->sNodeDBTable[uNodeIndex].bPSEnable) {
|
|
|
|
|
@@ -2562,13 +2562,13 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
|
|
|
return STATUS_RESOURCES;
|
|
|
}
|
|
|
|
|
|
- memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), ETH_HLEN);
|
|
|
+ memcpy(pDevice->sTxEthHeader.abyDstAddr, (u8 *)(skb->data), ETH_HLEN);
|
|
|
|
|
|
//mike add:station mode check eapol-key challenge--->
|
|
|
{
|
|
|
- BYTE Protocol_Version; //802.1x Authentication
|
|
|
- BYTE Packet_Type; //802.1x Authentication
|
|
|
- BYTE Descriptor_type;
|
|
|
+ u8 Protocol_Version; //802.1x Authentication
|
|
|
+ u8 Packet_Type; //802.1x Authentication
|
|
|
+ u8 Descriptor_type;
|
|
|
WORD Key_info;
|
|
|
|
|
|
Protocol_Version = skb->data[ETH_HLEN];
|
|
@@ -2665,7 +2665,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- byPktType = (BYTE)pDevice->byPacketType;
|
|
|
+ byPktType = (u8)pDevice->byPacketType;
|
|
|
|
|
|
if (pDevice->bFixRate) {
|
|
|
if (pDevice->byBBType == BB_TYPE_11B) {
|
|
@@ -2793,9 +2793,9 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
|
|
|
}
|
|
|
|
|
|
fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType,
|
|
|
- (PBYTE)(&pContext->Data[0]), bNeedEncryption,
|
|
|
+ (u8 *)(&pContext->Data[0]), bNeedEncryption,
|
|
|
skb->len, uDMAIdx, &pDevice->sTxEthHeader,
|
|
|
- (PBYTE)skb->data, pTransmitKey, uNodeIndex,
|
|
|
+ (u8 *)skb->data, pTransmitKey, uNodeIndex,
|
|
|
pDevice->wCurrentRate,
|
|
|
&uHeaderLen, &BytesToWrite
|
|
|
);
|
|
@@ -2816,21 +2816,21 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
|
|
|
}
|
|
|
|
|
|
pTX_Buffer = (PTX_BUFFER)&(pContext->Data[0]);
|
|
|
- pTX_Buffer->byPKTNO = (BYTE) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
+ pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
pTX_Buffer->wTxByteCount = (WORD)BytesToWrite;
|
|
|
|
|
|
pContext->pPacket = skb;
|
|
|
pContext->Type = CONTEXT_DATA_PACKET;
|
|
|
pContext->uBufLen = (WORD)BytesToWrite + 4 ; //USB header
|
|
|
|
|
|
- s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl);
|
|
|
+ s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl);
|
|
|
|
|
|
status = PIPEnsSendBulkOut(pDevice,pContext);
|
|
|
|
|
|
if (bNeedDeAuth == true) {
|
|
|
WORD wReason = WLAN_MGMT_REASON_MIC_FAILURE;
|
|
|
|
|
|
- bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (PBYTE) &wReason);
|
|
|
+ bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (u8 *) &wReason);
|
|
|
}
|
|
|
|
|
|
if(status!=STATUS_PENDING) {
|
|
@@ -2885,7 +2885,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)pbySkbData, ETH_HLEN);
|
|
|
+ memcpy(pDevice->sTxEthHeader.abyDstAddr, (u8 *)pbySkbData, ETH_HLEN);
|
|
|
|
|
|
if (pDevice->bEncryptionEnable == true) {
|
|
|
bNeedEncryption = true;
|
|
@@ -2919,7 +2919,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- byPktTyp = (BYTE)pDevice->byPacketType;
|
|
|
+ byPktTyp = (u8)pDevice->byPacketType;
|
|
|
|
|
|
if (pDevice->bFixRate) {
|
|
|
if (pDevice->byBBType == BB_TYPE_11B) {
|
|
@@ -2957,7 +2957,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
|
|
|
// and send the irp.
|
|
|
|
|
|
fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType,
|
|
|
- (PBYTE)(&pContext->Data[0]), bNeedEncryption,
|
|
|
+ (u8 *)(&pContext->Data[0]), bNeedEncryption,
|
|
|
uDataLen, TYPE_AC0DMA, &pDevice->sTxEthHeader,
|
|
|
pbySkbData, pTransmitKey, uNodeIndex,
|
|
|
pDevice->wCurrentRate,
|
|
@@ -2970,14 +2970,14 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
|
|
|
}
|
|
|
|
|
|
pTX_Buffer = (PTX_BUFFER)&(pContext->Data[0]);
|
|
|
- pTX_Buffer->byPKTNO = (BYTE) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
+ pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
|
|
|
pTX_Buffer->wTxByteCount = (WORD)BytesToWrite;
|
|
|
|
|
|
pContext->pPacket = NULL;
|
|
|
pContext->Type = CONTEXT_DATA_PACKET;
|
|
|
pContext->uBufLen = (WORD)BytesToWrite + 4 ; //USB header
|
|
|
|
|
|
- s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl);
|
|
|
+ s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl);
|
|
|
|
|
|
status = PIPEnsSendBulkOut(pDevice,pContext);
|
|
|
|