Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 170
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 8281958b 编写于 作者: B Bartlomiej Zolnierkiewicz 提交者： Greg Kroah-Hartman
浏览文件
操作

Staging: rt28x0: fix comments in sta/*.c files 

Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 ec278fa2
展开全部 隐藏空白更改
内联 并排
Showing with 1129 addition and 1129 deletion
drivers/staging/rt2860/sta/assoc.c
浏览文件 @ 8281958b
此差异已折叠。
drivers/staging/rt2860/sta/auth.c
浏览文件 @ 8281958b
...@@ -62,11 +62,11 @@ void AuthStateMachineInit(IN PRTMP_ADAPTER pAd, ...@@ -62,11 +62,11 @@ void AuthStateMachineInit(IN PRTMP_ADAPTER pAd,
(STATE_MACHINE_FUNC) Drop, AUTH_REQ_IDLE, (STATE_MACHINE_FUNC) Drop, AUTH_REQ_IDLE,
AUTH_MACHINE_BASE); AUTH_MACHINE_BASE);
// the first column /* the first column */
StateMachineSetAction(Sm, AUTH_REQ_IDLE, MT2_MLME_AUTH_REQ, StateMachineSetAction(Sm, AUTH_REQ_IDLE, MT2_MLME_AUTH_REQ,
(STATE_MACHINE_FUNC) MlmeAuthReqAction); (STATE_MACHINE_FUNC) MlmeAuthReqAction);
// the second column /* the second column */
StateMachineSetAction(Sm, AUTH_WAIT_SEQ2, MT2_MLME_AUTH_REQ, StateMachineSetAction(Sm, AUTH_WAIT_SEQ2, MT2_MLME_AUTH_REQ,
(STATE_MACHINE_FUNC) InvalidStateWhenAuth); (STATE_MACHINE_FUNC) InvalidStateWhenAuth);
StateMachineSetAction(Sm, AUTH_WAIT_SEQ2, MT2_PEER_AUTH_EVEN, StateMachineSetAction(Sm, AUTH_WAIT_SEQ2, MT2_PEER_AUTH_EVEN,
...@@ -74,7 +74,7 @@ void AuthStateMachineInit(IN PRTMP_ADAPTER pAd, ...@@ -74,7 +74,7 @@ void AuthStateMachineInit(IN PRTMP_ADAPTER pAd,
StateMachineSetAction(Sm, AUTH_WAIT_SEQ2, MT2_AUTH_TIMEOUT, StateMachineSetAction(Sm, AUTH_WAIT_SEQ2, MT2_AUTH_TIMEOUT,
(STATE_MACHINE_FUNC) AuthTimeoutAction); (STATE_MACHINE_FUNC) AuthTimeoutAction);
// the third column /* the third column */
StateMachineSetAction(Sm, AUTH_WAIT_SEQ4, MT2_MLME_AUTH_REQ, StateMachineSetAction(Sm, AUTH_WAIT_SEQ4, MT2_MLME_AUTH_REQ,
(STATE_MACHINE_FUNC) InvalidStateWhenAuth); (STATE_MACHINE_FUNC) InvalidStateWhenAuth);
StateMachineSetAction(Sm, AUTH_WAIT_SEQ4, MT2_PEER_AUTH_EVEN, StateMachineSetAction(Sm, AUTH_WAIT_SEQ4, MT2_PEER_AUTH_EVEN,
...@@ -103,13 +103,13 @@ VOID AuthTimeout(IN PVOID SystemSpecific1, ...@@ -103,13 +103,13 @@ VOID AuthTimeout(IN PVOID SystemSpecific1,
DBGPRINT(RT_DEBUG_TRACE, ("AUTH - AuthTimeout\n")); DBGPRINT(RT_DEBUG_TRACE, ("AUTH - AuthTimeout\n"));
// Do nothing if the driver is starting halt state. /* Do nothing if the driver is starting halt state. */
// This might happen when timer already been fired before cancel timer with mlmehalt /* This might happen when timer already been fired before cancel timer with mlmehalt */
if (RTMP_TEST_FLAG if (RTMP_TEST_FLAG
(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS | fRTMP_ADAPTER_NIC_NOT_EXIST)) (pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS | fRTMP_ADAPTER_NIC_NOT_EXIST))
return; return;
// send a de-auth to reset AP's state machine (Patch AP-Dir635) /* send a de-auth to reset AP's state machine (Patch AP-Dir635) */
if (pAd->Mlme.AuthMachine.CurrState == AUTH_WAIT_SEQ2) if (pAd->Mlme.AuthMachine.CurrState == AUTH_WAIT_SEQ2)
Cls2errAction(pAd, pAd->MlmeAux.Bssid); Cls2errAction(pAd, pAd->MlmeAux.Bssid);
...@@ -173,7 +173,7 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -173,7 +173,7 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
&TimerCancelled); &TimerCancelled);
if (Status == MLME_SUCCESS) { if (Status == MLME_SUCCESS) {
// Authentication Mode "LEAP" has allow for CCX 1.X /* Authentication Mode "LEAP" has allow for CCX 1.X */
if (pAd->MlmeAux.Alg == Ndis802_11AuthModeOpen) { if (pAd->MlmeAux.Alg == Ndis802_11AuthModeOpen) {
pAd->Mlme.AuthMachine.CurrState = pAd->Mlme.AuthMachine.CurrState =
AUTH_REQ_IDLE; AUTH_REQ_IDLE;
...@@ -181,11 +181,11 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -181,11 +181,11 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
MLME_CNTL_STATE_MACHINE, MLME_CNTL_STATE_MACHINE,
MT2_AUTH_CONF, 2, &Status); MT2_AUTH_CONF, 2, &Status);
} else { } else {
// 2. shared key, need to be challenged /* 2. shared key, need to be challenged */
Seq++; Seq++;
RemoteStatus = MLME_SUCCESS; RemoteStatus = MLME_SUCCESS;
// Get an unused nonpaged memory /* Get an unused nonpaged memory */
NStatus = NStatus =
MlmeAllocateMemory(pAd, MlmeAllocateMemory(pAd,
&pOutBuffer); &pOutBuffer);
...@@ -208,7 +208,7 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -208,7 +208,7 @@ VOID PeerAuthRspAtSeq2Action(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
SUBTYPE_AUTH, 0, Addr2, SUBTYPE_AUTH, 0, Addr2,
pAd->MlmeAux.Bssid); pAd->MlmeAux.Bssid);
AuthHdr.FC.Wep = 1; AuthHdr.FC.Wep = 1;
// Encrypt challenge text & auth information /* Encrypt challenge text & auth information */
RTMPInitWepEngine(pAd, RTMPInitWepEngine(pAd,
pAd-> pAd->
SharedKey[BSS0][pAd-> SharedKey[BSS0][pAd->
...@@ -332,7 +332,7 @@ VOID MlmeDeauthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -332,7 +332,7 @@ VOID MlmeDeauthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
pInfo = (MLME_DEAUTH_REQ_STRUCT *) Elem->Msg; pInfo = (MLME_DEAUTH_REQ_STRUCT *) Elem->Msg;
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); //Get an unused nonpaged memory NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); /*Get an unused nonpaged memory */
if (NStatus != NDIS_STATUS_SUCCESS) { if (NStatus != NDIS_STATUS_SUCCESS) {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("AUTH - MlmeDeauthReqAction() allocate memory fail\n")); ("AUTH - MlmeDeauthReqAction() allocate memory fail\n"));
...@@ -359,7 +359,7 @@ VOID MlmeDeauthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -359,7 +359,7 @@ VOID MlmeDeauthReqAction(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Status = MLME_SUCCESS; Status = MLME_SUCCESS;
MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_DEAUTH_CONF, 2, &Status); MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_DEAUTH_CONF, 2, &Status);
// send wireless event - for deauthentication /* send wireless event - for deauthentication */
if (pAd->CommonCfg.bWirelessEvent) if (pAd->CommonCfg.bWirelessEvent)
RTMPSendWirelessEvent(pAd, IW_DEAUTH_EVENT_FLAG, RTMPSendWirelessEvent(pAd, IW_DEAUTH_EVENT_FLAG,
pAd->MacTab.Content[BSSID_WCID].Addr, pAd->MacTab.Content[BSSID_WCID].Addr,
...@@ -422,7 +422,7 @@ VOID Cls2errAction(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr) ...@@ -422,7 +422,7 @@ VOID Cls2errAction(IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr)
ULONG FrameLen = 0; ULONG FrameLen = 0;
USHORT Reason = REASON_CLS2ERR; USHORT Reason = REASON_CLS2ERR;
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); //Get an unused nonpaged memory NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); /*Get an unused nonpaged memory */
if (NStatus != NDIS_STATUS_SUCCESS) if (NStatus != NDIS_STATUS_SUCCESS)
return; return;
...@@ -455,7 +455,7 @@ BOOLEAN AUTH_ReqSend(IN PRTMP_ADAPTER pAd, ...@@ -455,7 +455,7 @@ BOOLEAN AUTH_ReqSend(IN PRTMP_ADAPTER pAd,
PUCHAR pOutBuffer = NULL; PUCHAR pOutBuffer = NULL;
ULONG FrameLen = 0, tmp = 0; ULONG FrameLen = 0, tmp = 0;
// Block all authentication request durning WPA block period /* Block all authentication request durning WPA block period */
if (pAd->StaCfg.bBlockAssoc == TRUE) { if (pAd->StaCfg.bBlockAssoc == TRUE) {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("%s - Block Auth request durning WPA block period!\n", ("%s - Block Auth request durning WPA block period!\n",
...@@ -475,7 +475,7 @@ BOOLEAN AUTH_ReqSend(IN PRTMP_ADAPTER pAd, ...@@ -475,7 +475,7 @@ BOOLEAN AUTH_ReqSend(IN PRTMP_ADAPTER pAd,
Seq = SeqNo; Seq = SeqNo;
Status = MLME_SUCCESS; Status = MLME_SUCCESS;
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); //Get an unused nonpaged memory NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); /*Get an unused nonpaged memory */
if (NStatus != NDIS_STATUS_SUCCESS) { if (NStatus != NDIS_STATUS_SUCCESS) {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("%s - MlmeAuthReqAction(Alg:%d) allocate memory failed\n", ("%s - MlmeAuthReqAction(Alg:%d) allocate memory failed\n",
......
drivers/staging/rt2860/sta/auth_rsp.c
浏览文件 @ 8281958b
...@@ -55,11 +55,11 @@ VOID AuthRspStateMachineInit(IN PRTMP_ADAPTER pAd, ...@@ -55,11 +55,11 @@ VOID AuthRspStateMachineInit(IN PRTMP_ADAPTER pAd,
(STATE_MACHINE_FUNC) Drop, AUTH_RSP_IDLE, (STATE_MACHINE_FUNC) Drop, AUTH_RSP_IDLE,
AUTH_RSP_MACHINE_BASE); AUTH_RSP_MACHINE_BASE);
// column 1 /* column 1 */
StateMachineSetAction(Sm, AUTH_RSP_IDLE, MT2_PEER_DEAUTH, StateMachineSetAction(Sm, AUTH_RSP_IDLE, MT2_PEER_DEAUTH,
(STATE_MACHINE_FUNC) PeerDeauthAction); (STATE_MACHINE_FUNC) PeerDeauthAction);
// column 2 /* column 2 */
StateMachineSetAction(Sm, AUTH_RSP_WAIT_CHAL, MT2_PEER_DEAUTH, StateMachineSetAction(Sm, AUTH_RSP_WAIT_CHAL, MT2_PEER_DEAUTH,
(STATE_MACHINE_FUNC) PeerDeauthAction); (STATE_MACHINE_FUNC) PeerDeauthAction);
...@@ -88,7 +88,7 @@ VOID PeerAuthSimpleRspGenAndSend(IN PRTMP_ADAPTER pAd, ...@@ -88,7 +88,7 @@ VOID PeerAuthSimpleRspGenAndSend(IN PRTMP_ADAPTER pAd,
DBGPRINT(RT_DEBUG_TRACE, ("Peer AUTH fail...\n")); DBGPRINT(RT_DEBUG_TRACE, ("Peer AUTH fail...\n"));
return; return;
} }
//Get an unused nonpaged memory /*Get an unused nonpaged memory */
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); NStatus = MlmeAllocateMemory(pAd, &pOutBuffer);
if (NStatus != NDIS_STATUS_SUCCESS) if (NStatus != NDIS_STATUS_SUCCESS)
return; return;
...@@ -126,7 +126,7 @@ VOID PeerDeauthAction(IN PRTMP_ADAPTER pAd, IN PMLME_QUEUE_ELEM Elem) ...@@ -126,7 +126,7 @@ VOID PeerDeauthAction(IN PRTMP_ADAPTER pAd, IN PMLME_QUEUE_ELEM Elem)
RtmpOSWrielessEventSend(pAd, SIOCGIWAP, -1, NULL, NULL, RtmpOSWrielessEventSend(pAd, SIOCGIWAP, -1, NULL, NULL,
0); 0);
// send wireless event - for deauthentication /* send wireless event - for deauthentication */
if (pAd->CommonCfg.bWirelessEvent) if (pAd->CommonCfg.bWirelessEvent)
RTMPSendWirelessEvent(pAd, IW_DEAUTH_EVENT_FLAG, RTMPSendWirelessEvent(pAd, IW_DEAUTH_EVENT_FLAG,
pAd->MacTab. pAd->MacTab.
......
drivers/staging/rt2860/sta/sanity.c
浏览文件 @ 8281958b
...@@ -86,7 +86,7 @@ BOOLEAN MlmeStartReqSanity(IN PRTMP_ADAPTER pAd, ...@@ -86,7 +86,7 @@ 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 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 * pHtCapabilityLen,
OUT UCHAR * pAddHtInfoLen, OUT UCHAR * pAddHtInfoLen,
OUT UCHAR * pNewExtChannelOffset, OUT UCHAR * pNewExtChannelOffset,
...@@ -118,10 +118,10 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen ...@@ -118,10 +118,10 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
NdisMoveMemory(pAid, &pFrame->Octet[4], 2); NdisMoveMemory(pAid, &pFrame->Octet[4], 2);
Length += 2; Length += 2;
// Aid already swaped byte order in RTMPFrameEndianChange() for big endian platform /* Aid already swaped byte order in RTMPFrameEndianChange() for big endian platform */
*pAid = (*pAid) & 0x3fff; // AID is low 14-bit *pAid = (*pAid) & 0x3fff; /* AID is low 14-bit */
// -- get supported rates from payload and advance the pointer /* -- get supported rates from payload and advance the pointer */
IeType = pFrame->Octet[6]; IeType = pFrame->Octet[6];
*pSupRateLen = pFrame->Octet[7]; *pSupRateLen = pFrame->Octet[7];
if ((IeType != IE_SUPP_RATES) if ((IeType != IE_SUPP_RATES)
...@@ -134,11 +134,11 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen ...@@ -134,11 +134,11 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
Length = Length + 2 + *pSupRateLen; Length = Length + 2 + *pSupRateLen;
// many AP implement proprietary IEs in non-standard order, we'd better /* many AP implement proprietary IEs in non-standard order, we'd better */
// tolerate mis-ordered IEs to get best compatibility /* tolerate mis-ordered IEs to get best compatibility */
pEid = (PEID_STRUCT) & pFrame->Octet[8 + (*pSupRateLen)]; pEid = (PEID_STRUCT) & pFrame->Octet[8 + (*pSupRateLen)];
// get variable fields from payload and advance the pointer /* get variable fields from payload and advance the pointer */
while ((Length + 2 + pEid->Len) <= MsgLen) { while ((Length + 2 + pEid->Len) <= MsgLen) {
switch (pEid->Eid) { switch (pEid->Eid) {
case IE_EXT_SUPP_RATES: case IE_EXT_SUPP_RATES:
...@@ -150,7 +150,7 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen ...@@ -150,7 +150,7 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
case IE_HT_CAP: case IE_HT_CAP:
case IE_HT_CAP2: case IE_HT_CAP2:
if (pEid->Len >= SIZE_HT_CAP_IE) //Note: allow extension.!! if (pEid->Len >= SIZE_HT_CAP_IE) /*Note: allow extension.!! */
{ {
NdisMoveMemory(pHtCapability, pEid->Octet, NdisMoveMemory(pHtCapability, pEid->Octet,
SIZE_HT_CAP_IE); SIZE_HT_CAP_IE);
...@@ -172,8 +172,8 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen ...@@ -172,8 +172,8 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
case IE_ADD_HT: case IE_ADD_HT:
case IE_ADD_HT2: case IE_ADD_HT2:
if (pEid->Len >= sizeof(ADD_HT_INFO_IE)) { if (pEid->Len >= sizeof(ADD_HT_INFO_IE)) {
// This IE allows extension, but we can ignore extra bytes beyond our knowledge , so only /* This IE allows extension, but we can ignore extra bytes beyond our knowledge , so only */
// copy first sizeof(ADD_HT_INFO_IE) /* copy first sizeof(ADD_HT_INFO_IE) */
NdisMoveMemory(pAddHtInfo, pEid->Octet, NdisMoveMemory(pAddHtInfo, pEid->Octet,
sizeof(ADD_HT_INFO_IE)); sizeof(ADD_HT_INFO_IE));
...@@ -201,31 +201,31 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen ...@@ -201,31 +201,31 @@ BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen
break; break;
case IE_VENDOR_SPECIFIC: case IE_VENDOR_SPECIFIC:
// handle WME PARAMTER ELEMENT /* handle WME PARAMTER ELEMENT */
if (NdisEqualMemory(pEid->Octet, WME_PARM_ELEM, 6) if (NdisEqualMemory(pEid->Octet, WME_PARM_ELEM, 6)
&& (pEid->Len == 24)) { && (pEid->Len == 24)) {
PUCHAR ptr; PUCHAR ptr;
int i; int i;
// parsing EDCA parameters /* parsing EDCA parameters */
pEdcaParm->bValid = TRUE; pEdcaParm->bValid = TRUE;
pEdcaParm->bQAck = FALSE; // pEid->Octet[0] & 0x10; pEdcaParm->bQAck = FALSE; /* pEid->Octet[0] & 0x10; */
pEdcaParm->bQueueRequest = FALSE; // pEid->Octet[0] & 0x20; pEdcaParm->bQueueRequest = FALSE; /* pEid->Octet[0] & 0x20; */
pEdcaParm->bTxopRequest = FALSE; // pEid->Octet[0] & 0x40; pEdcaParm->bTxopRequest = FALSE; /* pEid->Octet[0] & 0x40; */
//pEdcaParm->bMoreDataAck = FALSE; // pEid->Octet[0] & 0x80; /*pEdcaParm->bMoreDataAck = FALSE; // pEid->Octet[0] & 0x80; */
pEdcaParm->EdcaUpdateCount = pEdcaParm->EdcaUpdateCount =
pEid->Octet[6] & 0x0f; pEid->Octet[6] & 0x0f;
pEdcaParm->bAPSDCapable = pEdcaParm->bAPSDCapable =
(pEid->Octet[6] & 0x80) ? 1 : 0; (pEid->Octet[6] & 0x80) ? 1 : 0;
ptr = (PUCHAR) & pEid->Octet[8]; ptr = (PUCHAR) & pEid->Octet[8];
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
UCHAR aci = (*ptr & 0x60) >> 5; // b5~6 is AC INDEX UCHAR aci = (*ptr & 0x60) >> 5; /* b5~6 is AC INDEX */
pEdcaParm->bACM[aci] = (((*ptr) & 0x10) == 0x10); // b5 is ACM pEdcaParm->bACM[aci] = (((*ptr) & 0x10) == 0x10); /* b5 is ACM */
pEdcaParm->Aifsn[aci] = (*ptr) & 0x0f; // b0~3 is AIFSN pEdcaParm->Aifsn[aci] = (*ptr) & 0x0f; /* b0~3 is AIFSN */
pEdcaParm->Cwmin[aci] = *(ptr + 1) & 0x0f; // b0~4 is Cwmin pEdcaParm->Cwmin[aci] = *(ptr + 1) & 0x0f; /* b0~4 is Cwmin */
pEdcaParm->Cwmax[aci] = *(ptr + 1) >> 4; // b5~8 is Cwmax pEdcaParm->Cwmax[aci] = *(ptr + 1) >> 4; /* b5~8 is Cwmax */
pEdcaParm->Txop[aci] = *(ptr + 2) + 256 * (*(ptr + 3)); // in unit of 32-us pEdcaParm->Txop[aci] = *(ptr + 2) + 256 * (*(ptr + 3)); /* in unit of 32-us */
ptr += 4; // point to next AC ptr += 4; /* point to next AC */
} }
} }
break; break;
...@@ -280,7 +280,7 @@ BOOLEAN PeerProbeReqSanity(IN PRTMP_ADAPTER pAd, ...@@ -280,7 +280,7 @@ BOOLEAN PeerProbeReqSanity(IN PRTMP_ADAPTER pAd,
Idx = *pSsidLen + 2; Idx = *pSsidLen + 2;
// -- get supported rates from payload and advance the pointer /* -- get supported rates from payload and advance the pointer */
IeType = pFrame->Octet[Idx]; IeType = pFrame->Octet[Idx];
RateLen = pFrame->Octet[Idx + 1]; RateLen = pFrame->Octet[Idx + 1];
if (IeType != IE_SUPP_RATES) { if (IeType != IE_SUPP_RATES) {
...@@ -319,15 +319,15 @@ BOOLEAN GetTimBit(IN CHAR * Ptr, ...@@ -319,15 +319,15 @@ BOOLEAN GetTimBit(IN CHAR * Ptr,
IdxPtr++; IdxPtr++;
*TimLen = *IdxPtr; *TimLen = *IdxPtr;
// get DTIM Count from TIM element /* get DTIM Count from TIM element */
IdxPtr++; IdxPtr++;
*DtimCount = *IdxPtr; *DtimCount = *IdxPtr;
// get DTIM Period from TIM element /* get DTIM Period from TIM element */
IdxPtr++; IdxPtr++;
*DtimPeriod = *IdxPtr; *DtimPeriod = *IdxPtr;
// get Bitmap Control from TIM element /* get Bitmap Control from TIM element */
IdxPtr++; IdxPtr++;
BitCntl = *IdxPtr; BitCntl = *IdxPtr;
...@@ -336,20 +336,20 @@ BOOLEAN GetTimBit(IN CHAR * Ptr, ...@@ -336,20 +336,20 @@ BOOLEAN GetTimBit(IN CHAR * Ptr,
else else
*BcastFlag = FALSE; *BcastFlag = FALSE;
// Parse Partial Virtual Bitmap from TIM element /* Parse Partial Virtual Bitmap from TIM element */
N1 = BitCntl & 0xfe; // N1 is the first bitmap byte# N1 = BitCntl & 0xfe; /* N1 is the first bitmap byte# */
N2 = *TimLen - 4 + N1; // N2 is the last bitmap byte# N2 = *TimLen - 4 + N1; /* N2 is the last bitmap byte# */
if ((Aid < (N1 << 3)) || (Aid >= ((N2 + 1) << 3))) if ((Aid < (N1 << 3)) || (Aid >= ((N2 + 1) << 3)))
*MessageToMe = FALSE; *MessageToMe = FALSE;
else { else {
MyByte = (Aid >> 3) - N1; // my byte position in the bitmap byte-stream MyByte = (Aid >> 3) - N1; /* my byte position in the bitmap byte-stream */
MyBit = Aid % 16 - ((MyByte & 0x01) ? 8 : 0); MyBit = Aid % 16 - ((MyByte & 0x01) ? 8 : 0);
IdxPtr += (MyByte + 1); IdxPtr += (MyByte + 1);
//if (*IdxPtr) /*if (*IdxPtr) */
// DBGPRINT(RT_DEBUG_WARN, ("TIM bitmap = 0x%02x\n", *IdxPtr)); /* DBGPRINT(RT_DEBUG_WARN, ("TIM bitmap = 0x%02x\n", *IdxPtr)); */
if (*IdxPtr & (0x01 << MyBit)) if (*IdxPtr & (0x01 << MyBit))
*MessageToMe = TRUE; *MessageToMe = TRUE;
......
drivers/staging/rt2860/sta/sync.c
浏览文件 @ 8281958b
此差异已折叠。
drivers/staging/rt2860/sta/wpa.c
浏览文件 @ 8281958b
...@@ -63,7 +63,7 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey) ...@@ -63,7 +63,7 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
ULONG Now; ULONG Now;
UCHAR unicastKey = (pWpaKey->Type == PAIRWISE_KEY ? 1 : 0); UCHAR unicastKey = (pWpaKey->Type == PAIRWISE_KEY ? 1 : 0);
// Record Last MIC error time and count /* Record Last MIC error time and count */
NdisGetSystemUpTime(&Now); NdisGetSystemUpTime(&Now);
if (pAd->StaCfg.MicErrCnt == 0) { if (pAd->StaCfg.MicErrCnt == 0) {
pAd->StaCfg.MicErrCnt++; pAd->StaCfg.MicErrCnt++;
...@@ -71,7 +71,7 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey) ...@@ -71,7 +71,7 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
NdisZeroMemory(pAd->StaCfg.ReplayCounter, 8); NdisZeroMemory(pAd->StaCfg.ReplayCounter, 8);
} else if (pAd->StaCfg.MicErrCnt == 1) { } else if (pAd->StaCfg.MicErrCnt == 1) {
if ((pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ)) < Now) { if ((pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ)) < Now) {
// Update Last MIC error time, this did not violate two MIC errors within 60 seconds /* Update Last MIC error time, this did not violate two MIC errors within 60 seconds */
pAd->StaCfg.LastMicErrorTime = Now; pAd->StaCfg.LastMicErrorTime = Now;
} else { } else {
...@@ -83,23 +83,23 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey) ...@@ -83,23 +83,23 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
BSS0, 0); BSS0, 0);
pAd->StaCfg.LastMicErrorTime = Now; pAd->StaCfg.LastMicErrorTime = Now;
// Violate MIC error counts, MIC countermeasures kicks in /* Violate MIC error counts, MIC countermeasures kicks in */
pAd->StaCfg.MicErrCnt++; pAd->StaCfg.MicErrCnt++;
// We shall block all reception /* We shall block all reception */
// We shall clean all Tx ring and disassoicate from AP after next EAPOL frame /* We shall clean all Tx ring and disassoicate from AP after next EAPOL frame */
// /* */
// No necessary to clean all Tx ring, on RTMPHardTransmit will stop sending non-802.1X EAPOL packets /* No necessary to clean all Tx ring, on RTMPHardTransmit will stop sending non-802.1X EAPOL packets */
// if pAd->StaCfg.MicErrCnt greater than 2. /* if pAd->StaCfg.MicErrCnt greater than 2. */
// /* */
// RTMPRingCleanUp(pAd, QID_AC_BK); /* RTMPRingCleanUp(pAd, QID_AC_BK); */
// RTMPRingCleanUp(pAd, QID_AC_BE); /* RTMPRingCleanUp(pAd, QID_AC_BE); */
// RTMPRingCleanUp(pAd, QID_AC_VI); /* RTMPRingCleanUp(pAd, QID_AC_VI); */
// RTMPRingCleanUp(pAd, QID_AC_VO); /* RTMPRingCleanUp(pAd, QID_AC_VO); */
// RTMPRingCleanUp(pAd, QID_HCCA); /* RTMPRingCleanUp(pAd, QID_HCCA); */
} }
} else { } else {
// MIC error count >= 2 /* MIC error count >= 2 */
// This should not happen /* This should not happen */
; ;
} }
MlmeEnqueue(pAd, MlmeEnqueue(pAd,
...@@ -112,7 +112,7 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey) ...@@ -112,7 +112,7 @@ VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
} }
#define LENGTH_EAP_H 4 #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)). /* 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, INT WpaCheckEapCode(IN PRTMP_ADAPTER pAd,
IN PUCHAR pFrame, IN USHORT FrameLen, IN USHORT OffSet) IN PUCHAR pFrame, IN USHORT FrameLen, IN USHORT OffSet)
{ {
...@@ -123,11 +123,11 @@ INT WpaCheckEapCode(IN PRTMP_ADAPTER pAd, ...@@ -123,11 +123,11 @@ INT WpaCheckEapCode(IN PRTMP_ADAPTER pAd,
if (FrameLen < OffSet + LENGTH_EAPOL_H + LENGTH_EAP_H) if (FrameLen < OffSet + LENGTH_EAPOL_H + LENGTH_EAP_H)
return result; return result;
pData = pFrame + OffSet; // skip offset bytes pData = pFrame + OffSet; /* skip offset bytes */
if (*(pData + 1) == EAPPacket) // 802.1x header - Packet Type if (*(pData + 1) == EAPPacket) /* 802.1x header - Packet Type */
{ {
result = *(pData + 4); // EAP header - Code result = *(pData + 4); /* EAP header - Code */
} }
return result; return result;
...@@ -161,7 +161,7 @@ VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -161,7 +161,7 @@ VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
bUnicast = (Elem->Msg[0] == 1 ? TRUE : FALSE); bUnicast = (Elem->Msg[0] == 1 ? TRUE : FALSE);
pAd->Sequence = ((pAd->Sequence) + 1) & (MAX_SEQ_NUMBER); pAd->Sequence = ((pAd->Sequence) + 1) & (MAX_SEQ_NUMBER);
// init 802.3 header and Fill Packet /* init 802.3 header and Fill Packet */
MAKE_802_3_HEADER(Header802_3, pAd->CommonCfg.Bssid, MAKE_802_3_HEADER(Header802_3, pAd->CommonCfg.Bssid,
pAd->CurrentAddress, EAPOL); pAd->CurrentAddress, EAPOL);
...@@ -171,59 +171,59 @@ VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem) ...@@ -171,59 +171,59 @@ VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
Packet.KeyDesc.Type = WPA1_KEY_DESC; Packet.KeyDesc.Type = WPA1_KEY_DESC;
// Request field presented /* Request field presented */
Packet.KeyDesc.KeyInfo.Request = 1; Packet.KeyDesc.KeyInfo.Request = 1;
if (pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) { if (pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) {
Packet.KeyDesc.KeyInfo.KeyDescVer = 2; Packet.KeyDesc.KeyInfo.KeyDescVer = 2;
} else // TKIP } else /* TKIP */
{ {
Packet.KeyDesc.KeyInfo.KeyDescVer = 1; Packet.KeyDesc.KeyInfo.KeyDescVer = 1;
} }
Packet.KeyDesc.KeyInfo.KeyType = (bUnicast ? PAIRWISEKEY : GROUPKEY); Packet.KeyDesc.KeyInfo.KeyType = (bUnicast ? PAIRWISEKEY : GROUPKEY);
// KeyMic field presented /* KeyMic field presented */
Packet.KeyDesc.KeyInfo.KeyMic = 1; Packet.KeyDesc.KeyInfo.KeyMic = 1;
// Error field presented /* Error field presented */
Packet.KeyDesc.KeyInfo.Error = 1; Packet.KeyDesc.KeyInfo.Error = 1;
// Update packet length after decide Key data payload /* Update packet length after decide Key data payload */
SET_UINT16_TO_ARRARY(Packet.Body_Len, LEN_EAPOL_KEY_MSG) SET_UINT16_TO_ARRARY(Packet.Body_Len, LEN_EAPOL_KEY_MSG)
// Key Replay Count /* Key Replay Count */
NdisMoveMemory(Packet.KeyDesc.ReplayCounter, NdisMoveMemory(Packet.KeyDesc.ReplayCounter,
pAd->StaCfg.ReplayCounter, LEN_KEY_DESC_REPLAY); pAd->StaCfg.ReplayCounter, LEN_KEY_DESC_REPLAY);
inc_byte_array(pAd->StaCfg.ReplayCounter, 8); inc_byte_array(pAd->StaCfg.ReplayCounter, 8);
// Convert to little-endian format. /* Convert to little-endian format. */
*((USHORT *) & Packet.KeyDesc.KeyInfo) = *((USHORT *) & Packet.KeyDesc.KeyInfo) =
cpu2le16(*((USHORT *) & Packet.KeyDesc.KeyInfo)); cpu2le16(*((USHORT *) & Packet.KeyDesc.KeyInfo));
MlmeAllocateMemory(pAd, (PUCHAR *) & pOutBuffer); // allocate memory MlmeAllocateMemory(pAd, (PUCHAR *) & pOutBuffer); /* allocate memory */
if (pOutBuffer == NULL) { if (pOutBuffer == NULL) {
return; return;
} }
// Prepare EAPOL frame for MIC calculation /* Prepare EAPOL frame for MIC calculation */
// Be careful, only EAPOL frame is counted for MIC calculation /* Be careful, only EAPOL frame is counted for MIC calculation */
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, &Packet, CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, &Packet,
END_OF_ARGS); END_OF_ARGS);
// Prepare and Fill MIC value /* Prepare and Fill MIC value */
NdisZeroMemory(Mic, sizeof(Mic)); NdisZeroMemory(Mic, sizeof(Mic));
if (pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) { // AES if (pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) { /* AES */
UCHAR digest[20] = { 0 }; UCHAR digest[20] = { 0 };
HMAC_SHA1(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen, HMAC_SHA1(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen,
digest, SHA1_DIGEST_SIZE); digest, SHA1_DIGEST_SIZE);
NdisMoveMemory(Mic, digest, LEN_KEY_DESC_MIC); NdisMoveMemory(Mic, digest, LEN_KEY_DESC_MIC);
} else { // TKIP } else { /* TKIP */
HMAC_MD5(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen, HMAC_MD5(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen,
Mic, MD5_DIGEST_SIZE); Mic, MD5_DIGEST_SIZE);
} }
NdisMoveMemory(Packet.KeyDesc.KeyMic, Mic, LEN_KEY_DESC_MIC); NdisMoveMemory(Packet.KeyDesc.KeyMic, Mic, LEN_KEY_DESC_MIC);
// copy frame to Tx ring and send MIC failure report frame to authenticator /* copy frame to Tx ring and send MIC failure report frame to authenticator */
RTMPToWirelessSta(pAd, &pAd->MacTab.Content[BSSID_WCID], RTMPToWirelessSta(pAd, &pAd->MacTab.Content[BSSID_WCID],
Header802_3, LENGTH_802_3, Header802_3, LENGTH_802_3,
(PUCHAR) & Packet, (PUCHAR) & Packet,
...@@ -262,7 +262,7 @@ VOID WpaDisassocApAndBlockAssoc(IN PVOID SystemSpecific1, ...@@ -262,7 +262,7 @@ VOID WpaDisassocApAndBlockAssoc(IN PVOID SystemSpecific1,
RTMP_ADAPTER *pAd = (PRTMP_ADAPTER) FunctionContext; RTMP_ADAPTER *pAd = (PRTMP_ADAPTER) FunctionContext;
MLME_DISASSOC_REQ_STRUCT DisassocReq; MLME_DISASSOC_REQ_STRUCT DisassocReq;
// disassoc from current AP first /* disassoc from current AP first */
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("RTMPReportMicError - disassociate with current AP after sending second continuous EAPOL frame\n")); ("RTMPReportMicError - disassociate with current AP after sending second continuous EAPOL frame\n"));
DisassocParmFill(pAd, &DisassocReq, pAd->CommonCfg.Bssid, DisassocParmFill(pAd, &DisassocReq, pAd->CommonCfg.Bssid,
...@@ -281,12 +281,12 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -281,12 +281,12 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
pEntry = &pAd->MacTab.Content[BSSID_WCID]; pEntry = &pAd->MacTab.Content[BSSID_WCID];
// Pairwise key shall use key#0 /* Pairwise key shall use key#0 */
pSharedKey = &pAd->SharedKey[BSS0][0]; pSharedKey = &pAd->SharedKey[BSS0][0];
NdisMoveMemory(pAd->StaCfg.PTK, pEntry->PTK, LEN_PTK); NdisMoveMemory(pAd->StaCfg.PTK, pEntry->PTK, LEN_PTK);
// Prepare pair-wise key information into shared key table /* Prepare pair-wise key information into shared key table */
NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY)); NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY));
pSharedKey->KeyLen = LEN_TKIP_EK; pSharedKey->KeyLen = LEN_TKIP_EK;
NdisMoveMemory(pSharedKey->Key, &pAd->StaCfg.PTK[32], LEN_TKIP_EK); NdisMoveMemory(pSharedKey->Key, &pAd->StaCfg.PTK[32], LEN_TKIP_EK);
...@@ -295,7 +295,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -295,7 +295,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
NdisMoveMemory(pSharedKey->TxMic, NdisMoveMemory(pSharedKey->TxMic,
&pAd->StaCfg.PTK[48 + LEN_TKIP_RXMICK], LEN_TKIP_TXMICK); &pAd->StaCfg.PTK[48 + LEN_TKIP_RXMICK], LEN_TKIP_TXMICK);
// Decide its ChiperAlg /* Decide its ChiperAlg */
if (pAd->StaCfg.PairCipher == Ndis802_11Encryption2Enabled) if (pAd->StaCfg.PairCipher == Ndis802_11Encryption2Enabled)
pSharedKey->CipherAlg = CIPHER_TKIP; pSharedKey->CipherAlg = CIPHER_TKIP;
else if (pAd->StaCfg.PairCipher == Ndis802_11Encryption3Enabled) else if (pAd->StaCfg.PairCipher == Ndis802_11Encryption3Enabled)
...@@ -303,7 +303,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -303,7 +303,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
else else
pSharedKey->CipherAlg = CIPHER_NONE; pSharedKey->CipherAlg = CIPHER_NONE;
// Update these related information to MAC_TABLE_ENTRY /* Update these related information to MAC_TABLE_ENTRY */
NdisMoveMemory(pEntry->PairwiseKey.Key, &pAd->StaCfg.PTK[32], NdisMoveMemory(pEntry->PairwiseKey.Key, &pAd->StaCfg.PTK[32],
LEN_TKIP_EK); LEN_TKIP_EK);
NdisMoveMemory(pEntry->PairwiseKey.RxMic, &pAd->StaCfg.PTK[48], NdisMoveMemory(pEntry->PairwiseKey.RxMic, &pAd->StaCfg.PTK[48],
...@@ -312,7 +312,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -312,7 +312,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
&pAd->StaCfg.PTK[48 + LEN_TKIP_RXMICK], LEN_TKIP_TXMICK); &pAd->StaCfg.PTK[48 + LEN_TKIP_RXMICK], LEN_TKIP_TXMICK);
pEntry->PairwiseKey.CipherAlg = pSharedKey->CipherAlg; pEntry->PairwiseKey.CipherAlg = pSharedKey->CipherAlg;
// Update pairwise key information to ASIC Shared Key Table /* Update pairwise key information to ASIC Shared Key Table */
AsicAddSharedKeyEntry(pAd, AsicAddSharedKeyEntry(pAd,
BSS0, BSS0,
0, 0,
...@@ -320,7 +320,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -320,7 +320,7 @@ VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
pSharedKey->Key, pSharedKey->Key,
pSharedKey->TxMic, pSharedKey->RxMic); pSharedKey->TxMic, pSharedKey->RxMic);
// Update ASIC WCID attribute table and IVEIV table /* Update ASIC WCID attribute table and IVEIV table */
RTMPAddWcidAttributeEntry(pAd, BSS0, 0, pSharedKey->CipherAlg, pEntry); RTMPAddWcidAttributeEntry(pAd, BSS0, 0, pSharedKey->CipherAlg, pEntry);
STA_PORT_SECURED(pAd); STA_PORT_SECURED(pAd);
pAd->IndicateMediaState = NdisMediaStateConnected; pAd->IndicateMediaState = NdisMediaStateConnected;
...@@ -336,7 +336,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -336,7 +336,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd)
pSharedKey = &pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId]; pSharedKey = &pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId];
// Prepare pair-wise key information into shared key table /* Prepare pair-wise key information into shared key table */
NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY)); NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY));
pSharedKey->KeyLen = LEN_TKIP_EK; pSharedKey->KeyLen = LEN_TKIP_EK;
NdisMoveMemory(pSharedKey->Key, pAd->StaCfg.GTK, LEN_TKIP_EK); NdisMoveMemory(pSharedKey->Key, pAd->StaCfg.GTK, LEN_TKIP_EK);
...@@ -345,7 +345,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -345,7 +345,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd)
NdisMoveMemory(pSharedKey->TxMic, &pAd->StaCfg.GTK[24], NdisMoveMemory(pSharedKey->TxMic, &pAd->StaCfg.GTK[24],
LEN_TKIP_TXMICK); LEN_TKIP_TXMICK);
// Update Shared Key CipherAlg /* Update Shared Key CipherAlg */
pSharedKey->CipherAlg = CIPHER_NONE; pSharedKey->CipherAlg = CIPHER_NONE;
if (pAd->StaCfg.GroupCipher == Ndis802_11Encryption2Enabled) if (pAd->StaCfg.GroupCipher == Ndis802_11Encryption2Enabled)
pSharedKey->CipherAlg = CIPHER_TKIP; pSharedKey->CipherAlg = CIPHER_TKIP;
...@@ -356,7 +356,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -356,7 +356,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd)
else if (pAd->StaCfg.GroupCipher == Ndis802_11GroupWEP104Enabled) else if (pAd->StaCfg.GroupCipher == Ndis802_11GroupWEP104Enabled)
pSharedKey->CipherAlg = CIPHER_WEP128; pSharedKey->CipherAlg = CIPHER_WEP128;
// Update group key information to ASIC Shared Key Table /* Update group key information to ASIC Shared Key Table */
AsicAddSharedKeyEntry(pAd, AsicAddSharedKeyEntry(pAd,
BSS0, BSS0,
pAd->StaCfg.DefaultKeyId, pAd->StaCfg.DefaultKeyId,
...@@ -364,7 +364,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd) ...@@ -364,7 +364,7 @@ VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd)
pSharedKey->Key, pSharedKey->Key,
pSharedKey->TxMic, pSharedKey->RxMic); pSharedKey->TxMic, pSharedKey->RxMic);
// Update ASIC WCID attribute table and IVEIV table /* Update ASIC WCID attribute table and IVEIV table */
RTMPAddWcidAttributeEntry(pAd, RTMPAddWcidAttributeEntry(pAd,
BSS0, BSS0,
pAd->StaCfg.DefaultKeyId, pAd->StaCfg.DefaultKeyId,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或