Skip to content

L
linux
Commit cb850a64 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files
Options

staging:vt6655:wmgr: Whitespace cleanups 

Neatening only.
git diff -w shows no differences.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e2b8c6d3
Show whitespace changes
Inline Side-by-side
Showing with 4334 additions and 4334 deletions
drivers/staging/vt6655/wmgr.c
View file @ cb850a64
......@@ -89,7 +89,7 @@
/*--------------------- Static Classes ----------------------------*/
/*--------------------- Static Variables --------------------------*/
static int msglevel =MSG_LEVEL_INFO;
static int msglevel = MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG;
/*--------------------- Static Functions --------------------------*/
......@@ -97,7 +97,7 @@ static int msglevel =MSG_LEVEL_INFO;
static bool ChannelExceedZoneType(
PSDevice pDevice,
unsigned char byCurrChannel
);
);
// Association/diassociation functions
static
......@@ -111,7 +111,7 @@ s_MgrMakeAssocRequest(
PWLAN_IE_SSID pCurrSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
);
);
static
void
......@@ -120,7 +120,7 @@ s_vMgrRxAssocRequest(
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket,
unsigned int uNodeIndex
);
);
static
PSTxMgmtPacket
......@@ -133,7 +133,7 @@ s_MgrMakeReAssocRequest(
PWLAN_IE_SSID pCurrSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
);
);
static
void
......@@ -142,7 +142,7 @@ s_vMgrRxAssocResponse(
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket,
bool bReAssocType
);
);
static
void
......@@ -150,7 +150,7 @@ s_vMgrRxDisassociation(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
);
// Authentication/deauthen functions
static
......@@ -159,7 +159,7 @@ s_vMgrRxAuthenSequence_1(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
);
);
static
void
......@@ -167,7 +167,7 @@ s_vMgrRxAuthenSequence_2(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
);
);
static
void
......@@ -175,7 +175,7 @@ s_vMgrRxAuthenSequence_3(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
);
);
static
void
......@@ -183,7 +183,7 @@ s_vMgrRxAuthenSequence_4(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
);
);
static
void
......@@ -191,7 +191,7 @@ s_vMgrRxAuthentication(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
);
static
void
......@@ -199,7 +199,7 @@ s_vMgrRxDeauthentication(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
);
// Scan functions
// probe request/response functions
......@@ -209,7 +209,7 @@ s_vMgrRxProbeRequest(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
);
static
void
......@@ -217,7 +217,7 @@ s_vMgrRxProbeResponse(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
);
// beacon functions
static
......@@ -227,14 +227,14 @@ s_vMgrRxBeacon(
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket,
bool bInScan
);
);
static
void
s_vMgrFormatTIM(
PSMgmtObject pMgmt,
PWLAN_IE_TIM pTIM
);
);
static
PSTxMgmtPacket
......@@ -249,7 +249,7 @@ s_MgrMakeBeacon(
unsigned char *pCurrBSSID,
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
);
);
// Association response
......@@ -264,7 +264,7 @@ s_MgrMakeAssocResponse(
unsigned char *pDstAddr,
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
);
);
// ReAssociation response
static
......@@ -278,7 +278,7 @@ s_MgrMakeReAssocResponse(
unsigned char *pDstAddr,
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
);
);
// Probe response
static
......@@ -296,7 +296,7 @@ s_MgrMakeProbeResponse(
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates,
unsigned char byPHYType
);
);
// received status
static
......@@ -304,31 +304,31 @@ void
s_vMgrLogStatus(
PSMgmtObject pMgmt,
unsigned short wStatus
);
);
static
void
s_vMgrSynchBSS (
s_vMgrSynchBSS(
PSDevice pDevice,
unsigned int uBSSMode,
PKnownBSS pCurr,
PCMD_STATUS pStatus
);
);
static bool
s_bCipherMatch (
s_bCipherMatch(
PKnownBSS pBSSNode,
NDIS_802_11_ENCRYPTION_STATUS EncStatus,
unsigned char *pbyCCSPK,
unsigned char *pbyCCSGK
);
);
static void Encyption_Rebuild(
static void Encyption_Rebuild(
PSDevice pDevice,
PKnownBSS pCurr
);
);
......@@ -346,12 +346,12 @@ s_bCipherMatch (
* Return Value:
* Ndis_staus.
*
-*/
-*/
void
vMgrObjectInit(
void *hDeviceContext
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
......@@ -361,7 +361,7 @@ vMgrObjectInit(
pMgmt->pbyPSPacketPool = &pMgmt->byPSPacketPool[0];
pMgmt->pbyMgmtPacketPool = &pMgmt->byMgmtPacketPool[0];
pMgmt->uCurrChannel = pDevice->uChannel;
for(ii=0;ii<WLAN_BSSID_LEN;ii++) {
for (ii = 0; ii < WLAN_BSSID_LEN; ii++) {
pMgmt->abyDesireBSSID[ii] = 0xFF;
}
pMgmt->sAssocInfo.AssocInfo.Length = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION);
......@@ -382,12 +382,12 @@ vMgrObjectInit(
* Return Value:
* Ndis_staus.
*
-*/
-*/
void
vMgrTimerInit(
void *hDeviceContext
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
......@@ -403,7 +403,7 @@ vMgrTimerInit(
pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer;
pDevice->sTimerCommand.expires = RUN_AT(HZ);
#ifdef TxInSleep
#ifdef TxInSleep
init_timer(&pDevice->sTimerTxData);
pDevice->sTimerTxData.data = (unsigned long) pDevice;
pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData;
......@@ -411,7 +411,7 @@ vMgrTimerInit(
pDevice->fTxDataInSleep = false;
pDevice->IsTxDataTrigger = false;
pDevice->nTxDataTimeCout = 0;
#endif
#endif
pDevice->cbFreeCmdQueue = CMD_Q_SIZE;
pDevice->uCmdDequeueIdx = 0;
......@@ -430,12 +430,12 @@ vMgrTimerInit(
* Return Value:
* None.
*
-*/
-*/
void
vMgrObjectReset(
void *hDeviceContext
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
......@@ -458,7 +458,7 @@ vMgrObjectReset(
* Return Value:
* None.
*
-*/
-*/
void
......@@ -466,7 +466,7 @@ vMgrAssocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSTxMgmtPacket pTxPacket;
......@@ -510,9 +510,9 @@ vMgrAssocBeginSta(
(PWLAN_IE_SSID)pMgmt->abyCurrSSID,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates
);
);
if (pTxPacket != NULL ){
if (pTxPacket != NULL) {
/* send the frame */
*pStatus = csMgmt_xmit(pDevice, pTxPacket);
if (*pStatus == CMD_STATUS_PENDING) {
......@@ -523,7 +523,7 @@ vMgrAssocBeginSta(
else
*pStatus = CMD_STATUS_RESOURCES;
return ;
return;
}
......@@ -535,14 +535,14 @@ vMgrAssocBeginSta(
* Return Value:
* None.
*
-*/
-*/
void
vMgrReAssocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSTxMgmtPacket pTxPacket;
......@@ -589,9 +589,9 @@ vMgrReAssocBeginSta(
(PWLAN_IE_SSID)pMgmt->abyCurrSSID,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates
);
);
if (pTxPacket != NULL ){
if (pTxPacket != NULL) {
/* send the frame */
*pStatus = csMgmt_xmit(pDevice, pTxPacket);
if (*pStatus != CMD_STATUS_PENDING) {
......@@ -603,7 +603,7 @@ vMgrReAssocBeginSta(
}
return ;
return;
}
/*+
......@@ -614,7 +614,7 @@ vMgrReAssocBeginSta(
* Return Value:
* None.
*
-*/
-*/
void
vMgrDisassocBeginSta(
......@@ -623,7 +623,7 @@ vMgrDisassocBeginSta(
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSTxMgmtPacket pTxPacket = NULL;
......@@ -645,11 +645,11 @@ vMgrDisassocBeginSta(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_DISASSOC)
));
));
memcpy( sFrame.pHdr->sA3.abyAddr1, abyDestAddress, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr1, abyDestAddress, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
// Set reason code
*(sFrame.pwReason) = cpu_to_le16(wReason);
......@@ -676,7 +676,7 @@ vMgrDisassocBeginSta(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -685,7 +685,7 @@ s_vMgrRxAssocRequest(
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket,
unsigned int uNodeIndex
)
)
{
WLAN_FR_ASSOCREQ sFrame;
CMD_STATUS Status;
......@@ -746,13 +746,13 @@ s_vMgrRxAssocRequest(
&(pMgmt->sNodeDBTable[uNodeIndex].wSuppRate),
&(pMgmt->sNodeDBTable[uNodeIndex].byTopCCKBasicRate),
&(pMgmt->sNodeDBTable[uNodeIndex].byTopOFDMBasicRate)
);
);
// set max tx rate
pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate =
pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate;
#ifdef PLICE_DEBUG
printk("RxAssocRequest:wTxDataRate is %d\n",pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate);
printk("RxAssocRequest:wTxDataRate is %d\n", pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate);
#endif
// Todo: check sta preamble, if ap can't support, set status code
pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble =
......@@ -763,7 +763,7 @@ s_vMgrRxAssocRequest(
wAssocStatus = WLAN_MGMT_STATUS_SUCCESS;
wAssocAID = (unsigned short)uNodeIndex;
// check if ERP support
if(pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M)
if (pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M)
pMgmt->sNodeDBTable[uNodeIndex].bERPExist = true;
if (pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate <= RATE_11M) {
......@@ -783,7 +783,7 @@ s_vMgrRxAssocRequest(
sFrame.pHdr->sA3.abyAddr2[3],
sFrame.pHdr->sA3.abyAddr2[4],
sFrame.pHdr->sA3.abyAddr2[5]
) ;
);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Max Support rate = %d \n",
pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate);
}//else { TODO: received STA under state1 handle }
......@@ -803,8 +803,8 @@ s_vMgrRxAssocRequest(
sFrame.pHdr->sA3.abyAddr2,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates
);
if (pTxPacket != NULL ){
);
if (pTxPacket != NULL) {
if (pDevice->bEnableHostapd) {
return;
......@@ -838,7 +838,7 @@ s_vMgrRxAssocRequest(
*
* Return Value: None.
*
-*/
-*/
static
void
......@@ -847,7 +847,7 @@ s_vMgrRxReAssocRequest(
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket,
unsigned int uNodeIndex
)
)
{
WLAN_FR_REASSOCREQ sFrame;
CMD_STATUS Status;
......@@ -905,13 +905,13 @@ s_vMgrRxReAssocRequest(
&(pMgmt->sNodeDBTable[uNodeIndex].wSuppRate),
&(pMgmt->sNodeDBTable[uNodeIndex].byTopCCKBasicRate),
&(pMgmt->sNodeDBTable[uNodeIndex].byTopOFDMBasicRate)
);
);
// set max tx rate
pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate =
pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate;
#ifdef PLICE_DEBUG
printk("RxReAssocRequest:TxDataRate is %d\n",pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate);
printk("RxReAssocRequest:TxDataRate is %d\n", pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate);
#endif
// Todo: check sta preamble, if ap can't support, set status code
pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble =
......@@ -923,7 +923,7 @@ s_vMgrRxReAssocRequest(
wAssocAID = (unsigned short)uNodeIndex;
// if suppurt ERP
if(pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M)
if (pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M)
pMgmt->sNodeDBTable[uNodeIndex].bERPExist = true;
if (pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate <= RATE_11M) {
......@@ -943,7 +943,7 @@ s_vMgrRxReAssocRequest(
sFrame.pHdr->sA3.abyAddr2[3],
sFrame.pHdr->sA3.abyAddr2[4],
sFrame.pHdr->sA3.abyAddr2[5]
) ;
);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Max Support rate = %d \n",
pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate);
......@@ -963,7 +963,7 @@ s_vMgrRxReAssocRequest(
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates
);
if (pTxPacket != NULL ){
if (pTxPacket != NULL) {
/* send the frame */
if (pDevice->bEnableHostapd) {
return;
......@@ -988,7 +988,7 @@ s_vMgrRxReAssocRequest(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -997,7 +997,7 @@ s_vMgrRxAssocResponse(
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket,
bool bReAssocType
)
)
{
WLAN_FR_ASSOCRESP sFrame;
PWLAN_IE_SSID pItemSSID;
......@@ -1016,7 +1016,7 @@ s_vMgrRxAssocResponse(
if ((sFrame.pwCapInfo == 0) ||
(sFrame.pwStatus == 0) ||
(sFrame.pwAid == 0) ||
(sFrame.pSuppRates == 0)){
(sFrame.pSuppRates == 0)) {
DBG_PORT80(0xCC);
return;
}
......@@ -1030,17 +1030,17 @@ s_vMgrRxAssocResponse(
pMgmt->sAssocInfo.AssocInfo.OffsetResponseIEs = pMgmt->sAssocInfo.AssocInfo.OffsetRequestIEs + pMgmt->sAssocInfo.AssocInfo.RequestIELength;
pbyIEs = pMgmt->sAssocInfo.abyIEs;
pbyIEs += pMgmt->sAssocInfo.AssocInfo.RequestIELength;
memcpy(pbyIEs, (sFrame.pBuf + 24 +6), pMgmt->sAssocInfo.AssocInfo.ResponseIELength);
memcpy(pbyIEs, (sFrame.pBuf + 24 + 6), pMgmt->sAssocInfo.AssocInfo.ResponseIELength);
// save values and set current BSS state
if (cpu_to_le16((*(sFrame.pwStatus))) == WLAN_MGMT_STATUS_SUCCESS ){
if (cpu_to_le16((*(sFrame.pwStatus))) == WLAN_MGMT_STATUS_SUCCESS) {
// set AID
pMgmt->wCurrAID = cpu_to_le16((*(sFrame.pwAid)));
if ( (pMgmt->wCurrAID >> 14) != (BIT0 | BIT1) )
if ((pMgmt->wCurrAID >> 14) != (BIT0 | BIT1))
{
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "AID from AP, has two msb clear.\n");
}
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Association Successful, AID=%d.\n", pMgmt->wCurrAID & ~(BIT14|BIT15));
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Association Successful, AID=%d.\n", pMgmt->wCurrAID & ~(BIT14 | BIT15));
pMgmt->eCurrState = WMAC_STATE_ASSOC;
BSSvUpdateAPNode((void *)pDevice, sFrame.pwCapInfo, sFrame.pSuppRates, sFrame.pExtSuppRates);
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
......@@ -1048,7 +1048,7 @@ s_vMgrRxAssocResponse(
pDevice->bLinkPass = true;
pDevice->uBBVGADiffCount = 0;
if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
if(skb_tailroom(pDevice->skb) <(sizeof(viawget_wpa_header)+pMgmt->sAssocInfo.AssocInfo.ResponseIELength+
if (skb_tailroom(pDevice->skb) < (sizeof(viawget_wpa_header) + pMgmt->sAssocInfo.AssocInfo.ResponseIELength +
pMgmt->sAssocInfo.AssocInfo.RequestIELength)) { //data room not enough
dev_kfree_skb(pDevice->skb);
pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
......@@ -1061,7 +1061,7 @@ s_vMgrRxAssocResponse(
memcpy(pDevice->skb->data + sizeof(viawget_wpa_header) + wpahdr->req_ie_len,
pbyIEs,
wpahdr->resp_ie_len
);
);
skb_put(pDevice->skb, sizeof(viawget_wpa_header) + wpahdr->resp_ie_len + wpahdr->req_ie_len);
pDevice->skb->dev = pDevice->wpadev;
skb_reset_mac_header(pDevice->skb);
......@@ -1074,7 +1074,7 @@ s_vMgrRxAssocResponse(
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//if(pDevice->bWPADevEnable == true)
//if (pDevice->bWPADevEnable == true)
{
unsigned char buf[512];
size_t len;
......@@ -1084,9 +1084,9 @@ s_vMgrRxAssocResponse(
memset(buf, 0, 512);
len = pMgmt->sAssocInfo.AssocInfo.RequestIELength;
if(len) {
if (len) {
memcpy(buf, pMgmt->sAssocInfo.abyIEs, len);
memset(&wrqu, 0, sizeof (wrqu));
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = len;
we_event = IWEVASSOCREQIE;
wireless_send_event(pDevice->dev, we_event, &wrqu, buf);
......@@ -1095,16 +1095,16 @@ s_vMgrRxAssocResponse(
memset(buf, 0, 512);
len = pMgmt->sAssocInfo.AssocInfo.ResponseIELength;
if(len) {
if (len) {
memcpy(buf, pbyIEs, len);
memset(&wrqu, 0, sizeof (wrqu));
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = len;
we_event = IWEVASSOCRESPIE;
wireless_send_event(pDevice->dev, we_event, &wrqu, buf);
}
memset(&wrqu, 0, sizeof (wrqu));
memset(&wrqu, 0, sizeof(wrqu));
memcpy(wrqu.ap_addr.sa_data, &pMgmt->abyCurrBSSID[0], ETH_ALEN);
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
......@@ -1120,7 +1120,7 @@ s_vMgrRxAssocResponse(
// jump back to the auth state and indicate the error
pMgmt->eCurrState = WMAC_STATE_AUTH;
}
s_vMgrLogStatus(pMgmt,cpu_to_le16((*(sFrame.pwStatus))));
s_vMgrLogStatus(pMgmt, cpu_to_le16((*(sFrame.pwStatus))));
}
}
......@@ -1133,7 +1133,7 @@ s_vMgrRxAssocResponse(
#endif
if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
if (pMgmt->eCurrState == WMAC_STATE_ASSOC)
timer_expire(pDevice->sTimerCommand, 0);
return;
}
......@@ -1149,14 +1149,14 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
* Return Value:
* None.
*
-*/
-*/
void
vMgrAuthenBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
WLAN_FR_AUTHEN sFrame;
......@@ -1173,10 +1173,10 @@ vMgrAuthenBeginSta(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_AUTHEN)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
if (pMgmt->bShareKeyAlgorithm)
*(sFrame.pwAuthAlgorithm) = cpu_to_le16(WLAN_AUTH_ALG_SHAREDKEY);
else
......@@ -1188,12 +1188,12 @@ vMgrAuthenBeginSta(
pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
*pStatus = csMgmt_xmit(pDevice, pTxPacket);
if (*pStatus == CMD_STATUS_PENDING){
if (*pStatus == CMD_STATUS_PENDING) {
pMgmt->eCurrState = WMAC_STATE_AUTHPENDING;
*pStatus = CMD_STATUS_SUCCESS;
}
return ;
return;
}
......@@ -1207,7 +1207,7 @@ vMgrAuthenBeginSta(
* Return Value:
* None.
*
-*/
-*/
void
vMgrDeAuthenBeginSta(
......@@ -1216,7 +1216,7 @@ vMgrDeAuthenBeginSta(
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
WLAN_FR_DEAUTHEN sFrame;
......@@ -1234,11 +1234,11 @@ vMgrDeAuthenBeginSta(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_DEAUTHEN)
));
));
memcpy( sFrame.pHdr->sA3.abyAddr1, abyDestAddress, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr1, abyDestAddress, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
*(sFrame.pwReason) = cpu_to_le16(wReason); // deauthen. bcs left BSS
/* Adjust the length fields */
......@@ -1246,12 +1246,12 @@ vMgrDeAuthenBeginSta(
pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
*pStatus = csMgmt_xmit(pDevice, pTxPacket);
if (*pStatus == CMD_STATUS_PENDING){
if (*pStatus == CMD_STATUS_PENDING) {
*pStatus = CMD_STATUS_SUCCESS;
}
return ;
return;
}
......@@ -1263,7 +1263,7 @@ vMgrDeAuthenBeginSta(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -1271,7 +1271,7 @@ s_vMgrRxAuthentication(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
)
)
{
WLAN_FR_AUTHEN sFrame;
......@@ -1285,10 +1285,10 @@ s_vMgrRxAuthentication(
sFrame.len = pRxPacket->cbMPDULen;
sFrame.pBuf = (unsigned char *)pRxPacket->p80211Header;
vMgrDecodeAuthen(&sFrame);
switch (cpu_to_le16((*(sFrame.pwAuthSequence )))){
switch (cpu_to_le16((*(sFrame.pwAuthSequence)))) {
case 1:
//AP function
s_vMgrRxAuthenSequence_1(pDevice,pMgmt, &sFrame);
s_vMgrRxAuthenSequence_1(pDevice, pMgmt, &sFrame);
break;
case 2:
s_vMgrRxAuthenSequence_2(pDevice, pMgmt, &sFrame);
......@@ -1320,7 +1320,7 @@ s_vMgrRxAuthentication(
* Return Value:
* None.
*
-*/
-*/
static
......@@ -1329,7 +1329,7 @@ s_vMgrRxAuthenSequence_1(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
unsigned int uNodeIndex;
......@@ -1365,10 +1365,10 @@ s_vMgrRxAuthenSequence_1(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_AUTHEN)|
WLAN_SET_FC_ISWEP(0)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pFrame->pHdr->sA3.abyAddr2, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pFrame->pHdr->sA3.abyAddr2, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
*(sFrame.pwAuthAlgorithm) = *(pFrame->pwAuthAlgorithm);
*(sFrame.pwAuthSequence) = cpu_to_le16(2);
......@@ -1394,7 +1394,7 @@ s_vMgrRxAuthenSequence_1(
sFrame.pChallenge->len = WLAN_CHALLENGE_LEN;
memset(pMgmt->abyChallenge, 0, WLAN_CHALLENGE_LEN);
// get group key
if(KeybGetTransmitKey(&(pDevice->sKey), pDevice->abyBroadcastAddr, GROUP_KEY, &pTransmitKey) == true) {
if (KeybGetTransmitKey(&(pDevice->sKey), pDevice->abyBroadcastAddr, GROUP_KEY, &pTransmitKey) == true) {
rc4_init(&pDevice->SBox, pDevice->abyPRNG, pTransmitKey->uKeyLength+3);
rc4_encrypt(&pDevice->SBox, pMgmt->abyChallenge, pMgmt->abyChallenge, WLAN_CHALLENGE_LEN);
}
......@@ -1427,7 +1427,7 @@ s_vMgrRxAuthenSequence_1(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -1435,7 +1435,7 @@ s_vMgrRxAuthenSequence_2(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
)
)
{
WLAN_FR_AUTHEN sFrame;
PSTxMgmtPacket pTxPacket = NULL;
......@@ -1444,7 +1444,7 @@ s_vMgrRxAuthenSequence_2(
switch (cpu_to_le16((*(pFrame->pwAuthAlgorithm))))
{
case WLAN_AUTH_ALG_OPENSYSTEM:
if ( cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS ){
if (cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS) {
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (OPEN) Successful.\n");
pMgmt->eCurrState = WMAC_STATE_AUTH;
timer_expire(pDevice->sTimerCommand, 0);
......@@ -1454,7 +1454,7 @@ s_vMgrRxAuthenSequence_2(
s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus))));
pMgmt->eCurrState = WMAC_STATE_IDLE;
}
if (pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) {
if (pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT) {
// spin_unlock_irq(&pDevice->lock);
// vCommandTimerWait((void *)pDevice, 0);
// spin_lock_irq(&pDevice->lock);
......@@ -1478,10 +1478,10 @@ s_vMgrRxAuthenSequence_2(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_AUTHEN)|
WLAN_SET_FC_ISWEP(1)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
*(sFrame.pwAuthAlgorithm) = *(pFrame->pwAuthAlgorithm);
*(sFrame.pwAuthSequence) = cpu_to_le16(3);
*(sFrame.pwStatus) = cpu_to_le16(WLAN_MGMT_STATUS_SUCCESS);
......@@ -1489,7 +1489,7 @@ s_vMgrRxAuthenSequence_2(
sFrame.len += WLAN_CHALLENGE_IE_LEN;
sFrame.pChallenge->byElementID = WLAN_EID_CHALLENGE;
sFrame.pChallenge->len = WLAN_CHALLENGE_LEN;
memcpy( sFrame.pChallenge->abyChallenge, pFrame->pChallenge->abyChallenge, WLAN_CHALLENGE_LEN);
memcpy(sFrame.pChallenge->abyChallenge, pFrame->pChallenge->abyChallenge, WLAN_CHALLENGE_LEN);
// Adjust the length fields
pTxPacket->cbMPDULen = sFrame.len;
pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
......@@ -1501,7 +1501,7 @@ s_vMgrRxAuthenSequence_2(
}
else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:rx Auth_reply sequence_2 status error ...\n");
if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) {
if (pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT) {
// spin_unlock_irq(&pDevice->lock);
// vCommandTimerWait((void *)pDevice, 0);
// spin_lock_irq(&pDevice->lock);
......@@ -1529,7 +1529,7 @@ s_vMgrRxAuthenSequence_2(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -1537,10 +1537,10 @@ s_vMgrRxAuthenSequence_3(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
unsigned int uStatusCode = 0 ;
unsigned int uStatusCode = 0;
unsigned int uNodeIndex = 0;
WLAN_FR_AUTHEN sFrame;
......@@ -1585,10 +1585,10 @@ s_vMgrRxAuthenSequence_3(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_AUTHEN)|
WLAN_SET_FC_ISWEP(0)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pFrame->pHdr->sA3.abyAddr2, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pFrame->pHdr->sA3.abyAddr2, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
*(sFrame.pwAuthAlgorithm) = *(pFrame->pwAuthAlgorithm);
*(sFrame.pwAuthSequence) = cpu_to_le16(4);
*(sFrame.pwStatus) = cpu_to_le16(uStatusCode);
......@@ -1618,28 +1618,28 @@ s_vMgrRxAuthenSequence_3(
* Return Value:
* None.
*
-*/
-*/
static
void
s_vMgrRxAuthenSequence_4(
PSDevice pDevice,
PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame
)
)
{
if ( cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS ){
if (cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS) {
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (SHAREDKEY) Successful.\n");
pMgmt->eCurrState = WMAC_STATE_AUTH;
timer_expire(pDevice->sTimerCommand, 0);
}
else{
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (SHAREDKEY) Failed.\n");
s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus))) );
s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus))));
pMgmt->eCurrState = WMAC_STATE_IDLE;
}
if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) {
if (pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT) {
// spin_unlock_irq(&pDevice->lock);
// vCommandTimerWait((void *)pDevice, 0);
// spin_lock_irq(&pDevice->lock);
......@@ -1656,7 +1656,7 @@ s_vMgrRxAuthenSequence_4(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -1664,14 +1664,14 @@ s_vMgrRxDisassociation(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
)
)
{
WLAN_FR_DISASSOC sFrame;
unsigned int uNodeIndex = 0;
// CMD_STATUS CmdStatus;
viawget_wpa_header *wpahdr;
if ( pMgmt->eCurrMode == WMAC_MODE_ESS_AP ){
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
// if is acting an AP..
// a STA is leaving this BSS..
sFrame.len = pRxPacket->cbMPDULen;
......@@ -1683,7 +1683,7 @@ s_vMgrRxDisassociation(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx disassoc, sta not found\n");
}
}
else if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA ){
else if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) {
sFrame.len = pRxPacket->cbMPDULen;
sFrame.pBuf = (unsigned char *)pRxPacket->p80211Header;
vMgrDecodeDisassociation(&sFrame);
......@@ -1709,16 +1709,16 @@ s_vMgrRxDisassociation(
pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
}
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
// if(pDevice->bWPASuppWextEnabled == true)
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
// if (pDevice->bWPASuppWextEnabled == true)
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof (wrqu));
memset(&wrqu, 0, sizeof(wrqu));
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
printk("wireless_send_event--->SIOCGIWAP(disassociated)\n");
wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
}
#endif
#endif
}
/* else, ignore it */
......@@ -1735,7 +1735,7 @@ s_vMgrRxDisassociation(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -1743,14 +1743,14 @@ s_vMgrRxDeauthentication(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
)
)
{
WLAN_FR_DEAUTHEN sFrame;
unsigned int uNodeIndex = 0;
viawget_wpa_header *wpahdr;
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP ){
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
//Todo:
// if is acting an AP..
// a STA is leaving this BSS..
......@@ -1764,7 +1764,7 @@ s_vMgrRxDeauthentication(
}
}
else {
if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA ) {
if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) {
sFrame.len = pRxPacket->cbMPDULen;
sFrame.pBuf = (unsigned char *)pRxPacket->p80211Header;
vMgrDecodeDeauthen(&sFrame);
......@@ -1795,16 +1795,16 @@ s_vMgrRxDeauthentication(
pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
}
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
// if(pDevice->bWPASuppWextEnabled == true)
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
// if (pDevice->bWPASuppWextEnabled == true)
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof (wrqu));
memset(&wrqu, 0, sizeof(wrqu));
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
PRINT_K("wireless_send_event--->SIOCGIWAP(disauthen)\n");
wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
}
#endif
#endif
}
/* else, ignore it. TODO: IBSS authentication service
......@@ -1825,23 +1825,23 @@ s_vMgrRxDeauthentication(
* Return Value:
* True:exceed;
* False:normal case
-*/
-*/
static bool
ChannelExceedZoneType(
PSDevice pDevice,
unsigned char byCurrChannel
)
)
{
bool exceed=false;
bool exceed = false;
switch(pDevice->byZoneType) {
switch (pDevice->byZoneType) {
case 0x00: //USA:1~11
if((byCurrChannel<1) ||(byCurrChannel>11))
if ((byCurrChannel < 1) || (byCurrChannel > 11))
exceed = true;
break;
case 0x01: //Japan:1~13
case 0x02: //Europe:1~13
if((byCurrChannel<1) ||(byCurrChannel>13))
if ((byCurrChannel < 1) || (byCurrChannel > 13))
exceed = true;
break;
default: //reserve for other zonetype
......@@ -1861,7 +1861,7 @@ ChannelExceedZoneType(
* Return Value:
* None.
*
-*/
-*/
static
void
......@@ -1870,7 +1870,7 @@ s_vMgrRxBeacon(
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket,
bool bInScan
)
)
{
PKnownBSS pBSSList;
......@@ -1909,7 +1909,7 @@ s_vMgrRxBeacon(
if ((sFrame.pwBeaconInterval == 0) ||
(sFrame.pwCapInfo == 0) ||
(sFrame.pSSID == 0) ||
(sFrame.pSuppRates == 0) ) {
(sFrame.pSuppRates == 0)) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx beacon frame error\n");
return;
}
......@@ -1932,7 +1932,7 @@ s_vMgrRxBeacon(
bChannelHit = true;
}
//2008-0730-01<Add>by MikeLiu
if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (ChannelExceedZoneType(pDevice, byCurrChannel) == true)
return;
if (sFrame.pERP != NULL) {
......@@ -1946,7 +1946,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
pBSSList = BSSpAddrIsInBSSList((void *)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID);
if (pBSSList == NULL) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon/insert: RxChannel = : %d\n", byCurrChannel);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Beacon/insert: RxChannel = : %d\n", byCurrChannel);
BSSbInsertToBSSList((void *)pDevice,
sFrame.pHdr->sA3.abyAddr3,
*sFrame.pqwTimestamp,
......@@ -1964,10 +1964,10 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
sFrame.len - WLAN_HDR_ADDR3_LEN,
sFrame.pHdr->sA4.abyAddr4, // payload of beacon
(void *)pRxPacket
);
);
}
else {
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"update bcn: RxChannel = : %d\n", byCurrChannel);
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "update bcn: RxChannel = : %d\n", byCurrChannel);
BSSbUpdateToBSSList((void *)pDevice,
*sFrame.pqwTimestamp,
*sFrame.pwBeaconInterval,
......@@ -1986,7 +1986,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
sFrame.len - WLAN_HDR_ADDR3_LEN,
sFrame.pHdr->sA4.abyAddr4, // payload of probresponse
(void *)pRxPacket
);
);
}
......@@ -1994,14 +1994,14 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
return;
}
if(byCurrChannel == (unsigned char)pMgmt->uCurrChannel)
if (byCurrChannel == (unsigned char)pMgmt->uCurrChannel)
bIsChannelEqual = true;
if (bIsChannelEqual && (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
// if rx beacon without ERP field
if (sERP.bERPExist) {
if (WLAN_GET_ERP_USE_PROTECTION(sERP.byERP)){
if (WLAN_GET_ERP_USE_PROTECTION(sERP.byERP)) {
pDevice->byERPFlag |= WLAN_SET_ERP_USE_PROTECTION(1);
pDevice->wUseProtectCntDown = USE_PROTECT_PERIOD;
}
......@@ -2012,14 +2012,14 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
}
if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
if(!WLAN_GET_CAP_INFO_SHORTPREAMBLE(*sFrame.pwCapInfo))
if (!WLAN_GET_CAP_INFO_SHORTPREAMBLE(*sFrame.pwCapInfo))
pDevice->byERPFlag |= WLAN_SET_ERP_BARKER_MODE(1);
if(!sERP.bERPExist)
if (!sERP.bERPExist)
pDevice->byERPFlag |= WLAN_SET_ERP_NONERP_PRESENT(1);
}
// set to MAC&BBP
if (WLAN_GET_ERP_USE_PROTECTION(pDevice->byERPFlag)){
if (WLAN_GET_ERP_USE_PROTECTION(pDevice->byERPFlag)) {
if (!pDevice->bProtectMode) {
MACvEnableProtectMD(pDevice->PortOffset);
pDevice->bProtectMode = true;
......@@ -2044,7 +2044,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (pMgmt->sNodeDBTable[0].uInActiveCount != 0) {
pMgmt->sNodeDBTable[0].uInActiveCount = 0;
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BCN:Wake Count= [%d]\n", pMgmt->wCountToWakeUp);
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN:Wake Count= [%d]\n", pMgmt->wCountToWakeUp);
}
}
// check if SSID the same
......@@ -2052,12 +2052,12 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (memcmp(sFrame.pSSID->abySSID,
((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->abySSID,
sFrame.pSSID->len
) == 0) {
) == 0) {
bIsSSIDEqual = true;
}
}
if ((WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo)== true) &&
if ((WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo) == true) &&
(bIsBSSIDEqual == true) &&
(bIsSSIDEqual == true) &&
(pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
......@@ -2092,7 +2092,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pBSSList->abyExtSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
uRateLen);
RATEvParseMaxRate( (void *)pDevice,
RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
true,
......@@ -2106,7 +2106,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
//printk("RxBeacon:MaxSuppRate is %d\n",pMgmt->sNodeDBTable[0].wMaxSuppRate);
#endif
if (bUpdatePhyParameter == true) {
CARDbSetPhyParameter( pMgmt->pAdapter,
CARDbSetPhyParameter(pMgmt->pAdapter,
pMgmt->eCurrentPHYMode,
pMgmt->wCurrCapInfo,
pMgmt->byERPContext,
......@@ -2118,10 +2118,10 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
CARDvSetPowerConstraint(pMgmt->pAdapter,
(unsigned char) pBSSList->uChannel,
sFrame.pIE_PowerConstraint->byPower
);
);
}
if (sFrame.pIE_CHSW != NULL) {
CARDbChannelSwitch( pMgmt->pAdapter,
CARDbChannelSwitch(pMgmt->pAdapter,
sFrame.pIE_CHSW->byMode,
get_channel_mapping(pMgmt->pAdapter, sFrame.pIE_CHSW->byMode, pMgmt->eCurrentPHYMode),
sFrame.pIE_CHSW->byCount
......@@ -2133,7 +2133,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
}
}
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon 2 \n");
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Beacon 2 \n");
// check if CF field exists
if (WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo)) {
if (sFrame.pCFParms->wCFPDurRemaining > 0) {
......@@ -2170,7 +2170,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
}
if (HIDWORD(qwTSFOffset) != 0 ||
(LODWORD(qwTSFOffset) > TRIVIAL_SYNC_DIFFERENCE )) {
(LODWORD(qwTSFOffset) > TRIVIAL_SYNC_DIFFERENCE)) {
bTSFLargeDiff = true;
}
......@@ -2182,10 +2182,10 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (bTSFLargeDiff)
bUpdateTSF = true;
if ((pDevice->bEnablePSMode == true) &&(sFrame.pTIM != 0)) {
if ((pDevice->bEnablePSMode == true) && (sFrame.pTIM != 0)) {
// deal with DTIM, analysis TIM
pMgmt->bMulticastTIM = WLAN_MGMT_IS_MULTICAST_TIM(sFrame.pTIM->byBitMapCtl) ? true : false ;
pMgmt->bMulticastTIM = WLAN_MGMT_IS_MULTICAST_TIM(sFrame.pTIM->byBitMapCtl) ? true : false;
pMgmt->byDTIMCount = sFrame.pTIM->byDTIMCount;
pMgmt->byDTIMPeriod = sFrame.pTIM->byDTIMPeriod;
wAIDNumber = pMgmt->wCurrAID & ~(BIT14|BIT15);
......@@ -2229,7 +2229,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (PSbSendNullPacket(pDevice))
pDevice->bPWBitOn = true;
}
if(PSbConsiderPowerDown(pDevice, false, false)) {
if (PSbConsiderPowerDown(pDevice, false, false)) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Power down now...\n");
}
}
......@@ -2257,7 +2257,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B);
RATEvParseMaxRate( (void *)pDevice,
RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
NULL,
true,
......@@ -2278,7 +2278,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B);
RATEvParseMaxRate( (void *)pDevice,
RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
NULL,
true,
......@@ -2295,12 +2295,12 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
#ifdef PLICE_DEBUG
//if (uNodeIndex == 0)
{
printk("s_vMgrRxBeacon:TxDataRate is %d,Index is %d\n",pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate,uNodeIndex);
printk("s_vMgrRxBeacon:TxDataRate is %d,Index is %d\n", pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate, uNodeIndex);
}
#endif
/*
pMgmt->sNodeDBTable[uNodeIndex].bShortSlotTime = WLAN_GET_CAP_INFO_SHORTSLOTTIME(*sFrame.pwCapInfo);
if(pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M)
if (pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M)
pMgmt->sNodeDBTable[uNodeIndex].bERPExist = true;
*/
}
......@@ -2310,7 +2310,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Current IBSS State: [Started]........to: [Jointed] \n");
pMgmt->eCurrState = WMAC_STATE_JOINTED;
pDevice->bLinkPass = true;
if (netif_queue_stopped(pDevice->dev)){
if (netif_queue_stopped(pDevice->dev)) {
netif_wake_queue(pDevice->dev);
}
pMgmt->sNodeDBTable[0].bActive = true;
......@@ -2324,7 +2324,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
// adpot this vars only when TSF larger then us.
if (bTSFLargeDiff && bTSFOffsetPostive) {
// we don't support ATIM under adhoc mode
// if ( sFrame.pIBSSParms->wATIMWindow == 0) {
// if (sFrame.pIBSSParms->wATIMWindow == 0) {
// adpot this vars
// TODO: check sFrame cap if privacy on, and support rate syn
memcpy(pMgmt->abyCurrBSSID, sFrame.pHdr->sA3.abyAddr3, WLAN_BSSID_LEN);
......@@ -2342,7 +2342,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
// Turn off bssid filter to avoid filter others adhoc station which bssid is different.
MACvWriteBSSIDAddress(pDevice->PortOffset, pMgmt->abyCurrBSSID);
CARDbSetPhyParameter ( pMgmt->pAdapter,
CARDbSetPhyParameter(pMgmt->pAdapter,
pMgmt->eCurrentPHYMode,
pMgmt->wCurrCapInfo,
pMgmt->byERPContext,
......@@ -2384,12 +2384,12 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
* Return Value:
* CMD_STATUS
*
-*/
-*/
void
vMgrCreateOwnIBSS(
void *hDeviceContext,
PCMD_STATUS pStatus
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
......@@ -2516,24 +2516,24 @@ vMgrCreateOwnIBSS(
memcpy(pMgmt->abyCurrSSID,
pMgmt->abyDesireSSID,
((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN
);
);
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
// AP mode BSSID = MAC addr
memcpy(pMgmt->abyCurrBSSID, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"AP beacon created BSSID:%pM\n",
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "AP beacon created BSSID:%pM\n",
pMgmt->abyCurrBSSID);
}
if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
// BSSID selected must be randomized as spec 11.1.3
pMgmt->abyCurrBSSID[5] = (unsigned char) (LODWORD(qwCurrTSF)& 0x000000ff);
pMgmt->abyCurrBSSID[4] = (unsigned char)((LODWORD(qwCurrTSF)& 0x0000ff00) >> 8);
pMgmt->abyCurrBSSID[3] = (unsigned char)((LODWORD(qwCurrTSF)& 0x00ff0000) >> 16);
pMgmt->abyCurrBSSID[2] = (unsigned char)((LODWORD(qwCurrTSF)& 0x00000ff0) >> 4);
pMgmt->abyCurrBSSID[1] = (unsigned char)((LODWORD(qwCurrTSF)& 0x000ff000) >> 12);
pMgmt->abyCurrBSSID[0] = (unsigned char)((LODWORD(qwCurrTSF)& 0x0ff00000) >> 20);
pMgmt->abyCurrBSSID[5] = (unsigned char) (LODWORD(qwCurrTSF) & 0x000000ff);
pMgmt->abyCurrBSSID[4] = (unsigned char)((LODWORD(qwCurrTSF) & 0x0000ff00) >> 8);
pMgmt->abyCurrBSSID[3] = (unsigned char)((LODWORD(qwCurrTSF) & 0x00ff0000) >> 16);
pMgmt->abyCurrBSSID[2] = (unsigned char)((LODWORD(qwCurrTSF) & 0x00000ff0) >> 4);
pMgmt->abyCurrBSSID[1] = (unsigned char)((LODWORD(qwCurrTSF) & 0x000ff000) >> 12);
pMgmt->abyCurrBSSID[0] = (unsigned char)((LODWORD(qwCurrTSF) & 0x0ff00000) >> 20);
pMgmt->abyCurrBSSID[5] ^= pMgmt->abyMACAddr[0];
pMgmt->abyCurrBSSID[4] ^= pMgmt->abyMACAddr[1];
pMgmt->abyCurrBSSID[3] ^= pMgmt->abyMACAddr[2];
......@@ -2544,7 +2544,7 @@ vMgrCreateOwnIBSS(
pMgmt->abyCurrBSSID[0] |= IEEE_ADDR_UNIVERSAL;
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"Adhoc beacon created bssid:%pM\n",
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Adhoc beacon created bssid:%pM\n",
pMgmt->abyCurrBSSID);
}
......@@ -2590,7 +2590,7 @@ vMgrCreateOwnIBSS(
CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC);
}
CARDbSetPhyParameter( pMgmt->pAdapter,
CARDbSetPhyParameter(pMgmt->pAdapter,
pMgmt->eCurrentPHYMode,
pMgmt->wCurrCapInfo,
pMgmt->byERPContext,
......@@ -2622,7 +2622,7 @@ vMgrCreateOwnIBSS(
*pStatus = CMD_STATUS_SUCCESS;
}
return ;
return;
}
......@@ -2638,13 +2638,13 @@ vMgrCreateOwnIBSS(
* Return Value:
* None.
*
-*/
-*/
void
vMgrJoinBSSBegin(
void *hDeviceContext,
PCMD_STATUS pStatus
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
......@@ -2680,9 +2680,9 @@ vMgrJoinBSSBegin(
pMgmt->abyDesireBSSID,
pMgmt->abyDesireSSID,
pMgmt->eConfigPHYMode
);
);
if (pCurr == NULL){
if (pCurr == NULL) {
*pStatus = CMD_STATUS_RESOURCES;
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Scanning [%s] not found, disconnected !\n", pItemSSID->abySSID);
......@@ -2690,22 +2690,22 @@ vMgrJoinBSSBegin(
}
DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP(BSS) finding:Found a AP(BSS)..\n");
if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))){
if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))) {
if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA)||(pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) || (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
// patch for CISCO migration mode
/*
if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) {
if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == false) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
// encryption mode error
pMgmt->eCurrState = WMAC_STATE_IDLE;
return;
}
} else if (pDevice->eEncryptionStatus == Ndis802_11Encryption3Enabled) {
if (WPA_SearchRSN(0, WPA_AESCCMP, pCurr) == false) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
// encryption mode error
pMgmt->eCurrState = WMAC_STATE_IDLE;
return;
......@@ -2715,7 +2715,7 @@ vMgrJoinBSSBegin(
}
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//if(pDevice->bWPASuppWextEnabled == true)
//if (pDevice->bWPASuppWextEnabled == true)
Encyption_Rebuild(pDevice, pCurr);
#endif
// Infrastructure BSS
......@@ -2723,9 +2723,9 @@ vMgrJoinBSSBegin(
WMAC_MODE_ESS_STA,
pCurr,
pStatus
);
);
if (*pStatus == CMD_STATUS_SUCCESS){
if (*pStatus == CMD_STATUS_SUCCESS) {
// Adopt this BSS state vars in Mgmt Object
pMgmt->uCurrChannel = pCurr->uChannel;
......@@ -2753,16 +2753,16 @@ vMgrJoinBSSBegin(
uRateLen);
// Stuffing Rate IE
if ((pItemExtRates->len > 0) && (pItemRates->len < 8)) {
for (ii = 0; ii < (unsigned int)(8 - pItemRates->len); ) {
for (ii = 0; ii < (unsigned int)(8 - pItemRates->len);) {
pItemRates->abyRates[pItemRates->len + ii] = pItemExtRates->abyRates[ii];
ii ++;
ii++;
if (pItemExtRates->len <= ii)
break;
}
pItemRates->len += (unsigned char)ii;
if (pItemExtRates->len - ii > 0) {
pItemExtRates->len -= (unsigned char)ii;
for (uu = 0; uu < pItemExtRates->len; uu ++) {
for (uu = 0; uu < pItemExtRates->len; uu++) {
pItemExtRates->abyRates[uu] = pItemExtRates->abyRates[uu + ii];
}
} else {
......@@ -2792,10 +2792,10 @@ vMgrJoinBSSBegin(
// This should only works for WPA2 BSS, and WPA2 BSS check must be done before.
if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) {
bool bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bAdd_PMKID_Candidate: 1(%d)\n", bResult);
if (bResult == false) {
vFlush_PMKID_Candidate((void *)pDevice);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 4\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vFlush_PMKID_Candidate: 4\n");
bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
}
}
......@@ -2803,11 +2803,11 @@ vMgrJoinBSSBegin(
// Preamble type auto-switch: if AP can receive short-preamble cap,
// we can turn on too.
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join ESS\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Join ESS\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"End of Join AP -- A/B/G Action\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "End of Join AP -- A/B/G Action\n");
}
else {
pMgmt->eCurrState = WMAC_STATE_IDLE;
......@@ -2842,9 +2842,9 @@ vMgrJoinBSSBegin(
WMAC_MODE_IBSS_STA,
pCurr,
pStatus
);
);
if (*pStatus == CMD_STATUS_SUCCESS){
if (*pStatus == CMD_STATUS_SUCCESS) {
// Adopt this BSS state vars in Mgmt Object
// TODO: check if CapInfo privacy on, but we don't..
pMgmt->uCurrChannel = pCurr->uChannel;
......@@ -2875,7 +2875,7 @@ vMgrJoinBSSBegin(
// pDevice->bLinkPass = true;
// memcpy(pDevice->abyBSSID, pCurr->abyBSSID, WLAN_BSSID_LEN);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join IBSS ok:%pM\n",
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Join IBSS ok:%pM\n",
pMgmt->abyCurrBSSID);
// Preamble type auto-switch: if AP can receive short-preamble cap,
// and if registry setting is short preamble we can turn on too.
......@@ -2901,15 +2901,15 @@ vMgrJoinBSSBegin(
* Return Value:
* PCM_STATUS
*
-*/
-*/
static
void
s_vMgrSynchBSS (
s_vMgrSynchBSS(
PSDevice pDevice,
unsigned int uBSSMode,
PKnownBSS pCurr,
PCMD_STATUS pStatus
)
)
{
CARD_PHY_TYPE ePhyType = PHY_TYPE_11B;
PSMgmtObject pMgmt = pDevice->pMgmt;
......@@ -2935,7 +2935,7 @@ s_vMgrSynchBSS (
pMgmt->pCurrBSS = pCurr;
// if previous mode is IBSS.
if(pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_BCNDMACTL, BEACON_READY);
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX);
}
......@@ -2958,7 +2958,7 @@ s_vMgrSynchBSS (
CARDbSetBeaconPeriod(pDevice, pCurr->wBeaconInterval);
// set Next TBTT
// Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval
// Next TBTT = ((local_current_TSF / beacon_interval) + 1) * beacon_interval
CARDvSetFirstNextTBTT(pDevice->PortOffset, pCurr->wBeaconInterval);
// set BSSID
......@@ -3018,7 +3018,7 @@ s_vMgrSynchBSS (
CARDbSetBSSID(pMgmt->pAdapter, pCurr->abyBSSID, OP_MODE_ADHOC);
}
if (CARDbSetPhyParameter( pMgmt->pAdapter,
if (CARDbSetPhyParameter(pMgmt->pAdapter,
ePhyType,
pCurr->wCapInfo,
pCurr->sERP.byERP,
......@@ -3035,7 +3035,7 @@ s_vMgrSynchBSS (
}
/*
for (ii=0;ii<BB_VGA_LEVEL;ii++) {
for (ii=0; ii<BB_VGA_LEVEL; ii++) {
if (pCurr->ldBmMAX< pDevice->ldBmThreshold[ii]) {
pDevice->byBBVGANew = pDevice->abyBBVGA[ii];
break;
......@@ -3043,7 +3043,7 @@ s_vMgrSynchBSS (
}
if (pDevice->byBBVGANew != pDevice->byBBVGACurrent) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RSSI[%d] NewGain[%d] OldGain[%d] \n",
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "RSSI[%d] NewGain[%d] OldGain[%d] \n",
(int)pCurr->ldBmMAX, pDevice->byBBVGANew, pDevice->byBBVGACurrent);
printk("RSSI[%d] NewGain[%d] OldGain[%d] \n",
(int)pCurr->ldBmMAX, pDevice->byBBVGANew, pDevice->byBBVGACurrent);
......@@ -3066,11 +3066,11 @@ s_vMgrSynchBSS (
//mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption
// ,need reset eAuthenMode and eEncryptionStatus
static void Encyption_Rebuild(
static void Encyption_Rebuild(
PSDevice pDevice,
PKnownBSS pCurr
)
{
)
{
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
// unsigned int ii , uSameBssidNum=0;
......@@ -3080,27 +3080,27 @@ s_vMgrSynchBSS (
// uSameBssidNum++;
// }
// }
// if( uSameBssidNum>=2) { //we only check AP in hidden sssid mode
// if (uSameBssidNum>=2) { //we only check AP in hidden sssid mode
if ((pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) || //networkmanager 0.7.0 does not give the pairwise-key selection,
(pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) { // so we need re-select it according to real pairwise-key info.
if(pCurr->bWPAValid == true) { //WPA-PSK
if (pCurr->bWPAValid == true) { //WPA-PSK
pMgmt->eAuthenMode = WMAC_AUTH_WPAPSK;
if(pCurr->abyPKType[0] == WPA_TKIP) {
if (pCurr->abyPKType[0] == WPA_TKIP) {
pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled; //TKIP
PRINT_K("Encyption_Rebuild--->ssid reset config to [WPAPSK-TKIP]\n");
}
else if(pCurr->abyPKType[0] == WPA_AESCCMP) {
else if (pCurr->abyPKType[0] == WPA_AESCCMP) {
pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled; //AES
PRINT_K("Encyption_Rebuild--->ssid reset config to [WPAPSK-AES]\n");
}
}
else if(pCurr->bWPA2Valid == true) { //WPA2-PSK
else if (pCurr->bWPA2Valid == true) { //WPA2-PSK
pMgmt->eAuthenMode = WMAC_AUTH_WPA2PSK;
if(pCurr->abyCSSPK[0] == WLAN_11i_CSS_TKIP) {
if (pCurr->abyCSSPK[0] == WLAN_11i_CSS_TKIP) {
pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled; //TKIP
PRINT_K("Encyption_Rebuild--->ssid reset config to [WPA2PSK-TKIP]\n");
}
else if(pCurr->abyCSSPK[0] == WLAN_11i_CSS_CCMP) {
else if (pCurr->abyCSSPK[0] == WLAN_11i_CSS_CCMP) {
pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled; //AES
PRINT_K("Encyption_Rebuild--->ssid reset config to [WPA2PSK-AES]\n");
}
......@@ -3108,7 +3108,7 @@ s_vMgrSynchBSS (
}
// }
return;
}
}
/*+
......@@ -3120,14 +3120,14 @@ s_vMgrSynchBSS (
* Return Value:
* void
*
-*/
-*/
static
void
s_vMgrFormatTIM(
PSMgmtObject pMgmt,
PWLAN_IE_TIM pTIM
)
)
{
unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
unsigned char byMap;
......@@ -3144,7 +3144,7 @@ s_vMgrFormatTIM(
if (!ii) {
// Mask out the broadcast bit which is indicated separately.
bMulticast = (byMap & byMask[0]) != 0;
if(bMulticast) {
if (bMulticast) {
pMgmt->sNodeDBTable[0].bRxPSPoll = true;
}
byMap = 0;
......@@ -3177,7 +3177,7 @@ s_vMgrFormatTIM(
// Append variable part of TIM
for (ii = wStartIndex, jj =0 ; ii <= wEndIndex; ii++, jj++) {
for (ii = wStartIndex, jj = 0; ii <= wEndIndex; ii++, jj++) {
pTIM->byVirtBitMap[jj] = pMgmt->abyPSTxMap[ii];
}
......@@ -3189,13 +3189,13 @@ s_vMgrFormatTIM(
/*+
*
* Routine Description:
* Constructs an Beacon frame( Ad-hoc mode)
* Constructs an Beacon frame(Ad-hoc mode)
*
*
* Return Value:
* PTR to frame; or NULL on allocation failure
*
-*/
-*/
static
PSTxMgmtPacket
......@@ -3210,7 +3210,7 @@ s_MgrMakeBeacon(
unsigned char *pCurrBSSID,
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_BEACON sFrame;
......@@ -3233,15 +3233,15 @@ s_MgrMakeBeacon(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_BEACON)
));
));
if (pDevice->bEnablePSMode) {
sFrame.pHdr->sA3.wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_PWRMGT(1));
}
memcpy( sFrame.pHdr->sA3.abyAddr1, abyBroadcastAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pCurrBSSID, WLAN_BSSID_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr1, abyBroadcastAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pCurrBSSID, WLAN_BSSID_LEN);
*sFrame.pwBeaconInterval = cpu_to_le16(wCurrBeaconPeriod);
*sFrame.pwCapInfo = cpu_to_le16(wCurrCapInfo);
// Copy SSID
......@@ -3250,14 +3250,14 @@ s_MgrMakeBeacon(
memcpy(sFrame.pSSID,
pCurrSSID,
((PWLAN_IE_SSID)pCurrSSID)->len + WLAN_IEHDR_LEN
);
);
// Copy the rate set
sFrame.pSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len);
sFrame.len += ((PWLAN_IE_SUPP_RATES)pCurrSuppRates)->len + WLAN_IEHDR_LEN;
memcpy(sFrame.pSuppRates,
pCurrSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrSuppRates)->len + WLAN_IEHDR_LEN
);
);
// DS parameter
if (pDevice->eCurrentPHYType != PHY_TYPE_11A) {
sFrame.pDSParms = (PWLAN_IE_DS_PARMS)(sFrame.pBuf + sFrame.len);
......@@ -3307,12 +3307,12 @@ s_MgrMakeBeacon(
// Pairwise Key Cipher Suite
sFrame.pRSNWPA->wPKCount = 0;
// Auth Key Management Suite
*((unsigned short *)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len))=0;
sFrame.pRSNWPA->len +=2;
*((unsigned short *)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len)) = 0;
sFrame.pRSNWPA->len += 2;
// RSN Capabilities
*((unsigned short *)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len))=0;
sFrame.pRSNWPA->len +=2;
*((unsigned short *)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len)) = 0;
sFrame.pRSNWPA->len += 2;
sFrame.len += sFrame.pRSNWPA->len + WLAN_IEHDR_LEN;
}
}
......@@ -3353,13 +3353,13 @@ s_MgrMakeBeacon(
pIBSSDFS = (PWLAN_IE_IBSS_DFS) pbyBuffer;
pIBSSDFS->byElementID = WLAN_EID_IBSS_DFS;
pIBSSDFS->len = 7;
memcpy( pIBSSDFS->abyDFSOwner,
memcpy(pIBSSDFS->abyDFSOwner,
pMgmt->abyIBSSDFSOwner,
6);
pIBSSDFS->byDFSRecovery = pMgmt->byIBSSDFSRecovery;
pbyBuffer += (7) + WLAN_IEHDR_LEN;
uLength += (7) + WLAN_IEHDR_LEN;
for(ii=CB_MAX_CHANNEL_24G+1; ii<=CB_MAX_CHANNEL; ii++ ) {
for (ii = CB_MAX_CHANNEL_24G+1; ii <= CB_MAX_CHANNEL; ii++) {
if (get_channel_map_info(pMgmt->pAdapter, ii, pbyBuffer, pbyBuffer+1) == true) {
pbyBuffer += 2;
uLength += 2;
......@@ -3389,7 +3389,7 @@ s_MgrMakeBeacon(
memcpy(sFrame.pExtSuppRates,
pCurrExtSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len + WLAN_IEHDR_LEN
);
);
}
// hostapd wpa/wpa2 IE
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnableHostapd == true)) {
......@@ -3422,7 +3422,7 @@ s_MgrMakeBeacon(
* Return Value:
* PTR to frame; or NULL on allocation failure
*
-*/
-*/
......@@ -3441,7 +3441,7 @@ s_MgrMakeProbeResponse(
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates,
unsigned char byPHYType
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_PROBERESP sFrame;
......@@ -3463,10 +3463,10 @@ s_MgrMakeProbeResponse(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_PROBERESP)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pDstAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pDstAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pCurrBSSID, WLAN_BSSID_LEN);
*sFrame.pwBeaconInterval = cpu_to_le16(wCurrBeaconPeriod);
*sFrame.pwCapInfo = cpu_to_le16(wCurrCapInfo);
......@@ -3480,7 +3480,7 @@ s_MgrMakeProbeResponse(
memcpy(sFrame.pSSID,
pCurrSSID,
((PWLAN_IE_SSID)pCurrSSID)->len + WLAN_IEHDR_LEN
);
);
// Copy the rate set
sFrame.pSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len);
......@@ -3488,7 +3488,7 @@ s_MgrMakeProbeResponse(
memcpy(sFrame.pSuppRates,
pCurrSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrSuppRates)->len + WLAN_IEHDR_LEN
);
);
// DS parameter
if (pDevice->eCurrentPHYType != PHY_TYPE_11A) {
......@@ -3557,13 +3557,13 @@ s_MgrMakeProbeResponse(
pIBSSDFS = (PWLAN_IE_IBSS_DFS) pbyBuffer;
pIBSSDFS->byElementID = WLAN_EID_IBSS_DFS;
pIBSSDFS->len = 7;
memcpy( pIBSSDFS->abyDFSOwner,
memcpy(pIBSSDFS->abyDFSOwner,
pMgmt->abyIBSSDFSOwner,
6);
pIBSSDFS->byDFSRecovery = pMgmt->byIBSSDFSRecovery;
pbyBuffer += (7) + WLAN_IEHDR_LEN;
uLength += (7) + WLAN_IEHDR_LEN;
for(ii=CB_MAX_CHANNEL_24G+1; ii<=CB_MAX_CHANNEL; ii++ ) {
for (ii = CB_MAX_CHANNEL_24G + 1; ii <= CB_MAX_CHANNEL; ii++) {
if (get_channel_map_info(pMgmt->pAdapter, ii, pbyBuffer, pbyBuffer+1) == true) {
pbyBuffer += 2;
uLength += 2;
......@@ -3581,7 +3581,7 @@ s_MgrMakeProbeResponse(
memcpy(sFrame.pExtSuppRates,
pCurrExtSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len + WLAN_IEHDR_LEN
);
);
}
// hostapd wpa/wpa2 IE
......@@ -3613,7 +3613,7 @@ s_MgrMakeProbeResponse(
* Return Value:
* A ptr to frame or NULL on allocation failure
*
-*/
-*/
PSTxMgmtPacket
......@@ -3626,7 +3626,7 @@ s_MgrMakeAssocRequest(
PWLAN_IE_SSID pCurrSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_ASSOCREQ sFrame;
......@@ -3647,10 +3647,10 @@ s_MgrMakeAssocRequest(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_ASSOCREQ)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pDAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pDAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
// Set the capability and listen interval
*(sFrame.pwCapInfo) = cpu_to_le16(wCurrCapInfo);
......@@ -3696,11 +3696,11 @@ s_MgrMakeAssocRequest(
CARDvGetPowerCapability(pMgmt->pAdapter,
&(sFrame.pCurrPowerCap->byMinPower),
&(sFrame.pCurrPowerCap->byMaxPower)
);
);
}
if (sFrame.pCurrSuppCh == NULL) {
sFrame.pCurrSuppCh = (PWLAN_IE_SUPP_CH)(sFrame.pBuf + sFrame.len);
sFrame.len += set_support_channels(pMgmt->pAdapter,(unsigned char *)sFrame.pCurrSuppCh);
sFrame.len += set_support_channels(pMgmt->pAdapter, (unsigned char *)sFrame.pCurrSuppCh);
}
}
......@@ -3744,29 +3744,29 @@ s_MgrMakeAssocRequest(
}
// Auth Key Management Suite
pbyRSN = (unsigned char *)(sFrame.pBuf + sFrame.len + 2 + sFrame.pRSNWPA->len);
*pbyRSN++=0x01;
*pbyRSN++=0x00;
*pbyRSN++=0x00;
*pbyRSN++ = 0x01;
*pbyRSN++ = 0x00;
*pbyRSN++ = 0x00;
*pbyRSN++=0x50;
*pbyRSN++=0xf2;
*pbyRSN++ = 0x50;
*pbyRSN++ = 0xf2;
if (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) {
*pbyRSN++=WPA_AUTH_PSK;
*pbyRSN++ = WPA_AUTH_PSK;
}
else if (pMgmt->eAuthenMode == WMAC_AUTH_WPA) {
*pbyRSN++=WPA_AUTH_IEEE802_1X;
*pbyRSN++ = WPA_AUTH_IEEE802_1X;
}
else {
*pbyRSN++=WPA_NONE;
*pbyRSN++ = WPA_NONE;
}
sFrame.pRSNWPA->len +=6;
sFrame.pRSNWPA->len += 6;
// RSN Capabilities
*pbyRSN++=0x00;
*pbyRSN++=0x00;
sFrame.pRSNWPA->len +=2;
*pbyRSN++ = 0x00;
*pbyRSN++ = 0x00;
sFrame.pRSNWPA->len += 2;
sFrame.len += sFrame.pRSNWPA->len + WLAN_IEHDR_LEN;
// copy to AssocInfo. for OID_802_11_ASSOCIATION_INFORMATION
......@@ -3829,7 +3829,7 @@ s_MgrMakeAssocRequest(
} else {
sFrame.pRSN->abyRSN[15] = WLAN_11i_AKMSS_UNKNOWN;
}
sFrame.pRSN->len +=6;
sFrame.pRSN->len += 6;
// RSN Capabilities
if (pMgmt->pCurrBSS->sRSNCapObj.bRSNCapExist == true) {
......@@ -3838,7 +3838,7 @@ s_MgrMakeAssocRequest(
sFrame.pRSN->abyRSN[16] = 0;
sFrame.pRSN->abyRSN[17] = 0;
}
sFrame.pRSN->len +=2;
sFrame.pRSN->len += 2;
if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && (pDevice->bRoaming == true) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
// RSN PMKID
......@@ -3847,8 +3847,8 @@ s_MgrMakeAssocRequest(
*pwPMKID = 0; // Initialize PMKID count
pbyRSN += 2; // Point to PMKID list
for (ii = 0; ii < pDevice->gsPMKID.BSSIDInfoCount; ii++) {
if ( !memcmp(&pDevice->gsPMKID.BSSIDInfo[ii].BSSID[0], pMgmt->abyCurrBSSID, ETH_ALEN)) {
(*pwPMKID) ++;
if (!memcmp(&pDevice->gsPMKID.BSSIDInfo[ii].BSSID[0], pMgmt->abyCurrBSSID, ETH_ALEN)) {
(*pwPMKID)++;
memcpy(pbyRSN, pDevice->gsPMKID.BSSIDInfo[ii].PMKID, 16);
pbyRSN += 16;
}
......@@ -3888,7 +3888,7 @@ s_MgrMakeAssocRequest(
* Return Value:
* A ptr to frame or NULL on allocation failure
*
-*/
-*/
PSTxMgmtPacket
......@@ -3901,7 +3901,7 @@ s_MgrMakeReAssocRequest(
PWLAN_IE_SSID pCurrSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_REASSOCREQ sFrame;
......@@ -3910,7 +3910,7 @@ s_MgrMakeReAssocRequest(
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
memset( pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_REASSOCREQ_FR_MAXLEN);
memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_REASSOCREQ_FR_MAXLEN);
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
/* Setup the sFrame structure. */
sFrame.pBuf = (unsigned char *)pTxPacket->p80211Header;
......@@ -3924,10 +3924,10 @@ s_MgrMakeReAssocRequest(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_REASSOCREQ)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pDAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pDAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
/* Set the capability and listen interval */
*(sFrame.pwCapInfo) = cpu_to_le16(wCurrCapInfo);
......@@ -4003,26 +4003,26 @@ s_MgrMakeReAssocRequest(
}
// Auth Key Management Suite
pbyRSN = (unsigned char *)(sFrame.pBuf + sFrame.len + 2 + sFrame.pRSNWPA->len);
*pbyRSN++=0x01;
*pbyRSN++=0x00;
*pbyRSN++=0x00;
*pbyRSN++ = 0x01;
*pbyRSN++ = 0x00;
*pbyRSN++ = 0x00;
*pbyRSN++=0x50;
*pbyRSN++=0xf2;
*pbyRSN++ = 0x50;
*pbyRSN++ = 0xf2;
if (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) {
*pbyRSN++=WPA_AUTH_PSK;
*pbyRSN++ = WPA_AUTH_PSK;
} else if (pMgmt->eAuthenMode == WMAC_AUTH_WPA) {
*pbyRSN++=WPA_AUTH_IEEE802_1X;
*pbyRSN++ = WPA_AUTH_IEEE802_1X;
} else {
*pbyRSN++=WPA_NONE;
*pbyRSN++ = WPA_NONE;
}
sFrame.pRSNWPA->len +=6;
sFrame.pRSNWPA->len += 6;
// RSN Capabilities
*pbyRSN++=0x00;
*pbyRSN++=0x00;
sFrame.pRSNWPA->len +=2;
*pbyRSN++ = 0x00;
*pbyRSN++ = 0x00;
sFrame.pRSNWPA->len += 2;
sFrame.len += sFrame.pRSNWPA->len + WLAN_IEHDR_LEN;
// copy to AssocInfo. for OID_802_11_ASSOCIATION_INFORMATION
......@@ -4085,7 +4085,7 @@ s_MgrMakeReAssocRequest(
} else {
sFrame.pRSN->abyRSN[15] = WLAN_11i_AKMSS_UNKNOWN;
}
sFrame.pRSN->len +=6;
sFrame.pRSN->len += 6;
// RSN Capabilities
if (pMgmt->pCurrBSS->sRSNCapObj.bRSNCapExist == true) {
......@@ -4094,7 +4094,7 @@ s_MgrMakeReAssocRequest(
sFrame.pRSN->abyRSN[16] = 0;
sFrame.pRSN->abyRSN[17] = 0;
}
sFrame.pRSN->len +=2;
sFrame.pRSN->len += 2;
if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && (pDevice->bRoaming == true) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
// RSN PMKID
......@@ -4103,14 +4103,14 @@ s_MgrMakeReAssocRequest(
*pwPMKID = 0; // Initialize PMKID count
pbyRSN += 2; // Point to PMKID list
for (ii = 0; ii < pDevice->gsPMKID.BSSIDInfoCount; ii++) {
if ( !memcmp(&pDevice->gsPMKID.BSSIDInfo[ii].BSSID[0], pMgmt->abyCurrBSSID, ETH_ALEN)) {
(*pwPMKID) ++;
if (!memcmp(&pDevice->gsPMKID.BSSIDInfo[ii].BSSID[0], pMgmt->abyCurrBSSID, ETH_ALEN)) {
(*pwPMKID)++;
memcpy(pbyRSN, pDevice->gsPMKID.BSSIDInfo[ii].PMKID, 16);
pbyRSN += 16;
}
}
if (*pwPMKID != 0) {
sFrame.pRSN->len += (2 + (*pwPMKID)*16);
sFrame.pRSN->len += (2 + (*pwPMKID) * 16);
}
}
......@@ -4140,7 +4140,7 @@ s_MgrMakeReAssocRequest(
* Return Value:
* PTR to frame; or NULL on allocation failure
*
-*/
-*/
PSTxMgmtPacket
......@@ -4153,7 +4153,7 @@ s_MgrMakeAssocResponse(
unsigned char *pDstAddr,
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_ASSOCRESP sFrame;
......@@ -4171,10 +4171,10 @@ s_MgrMakeAssocResponse(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_ASSOCRESP)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pDstAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pDstAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
*sFrame.pwCapInfo = cpu_to_le16(wCurrCapInfo);
*sFrame.pwStatus = cpu_to_le16(wAssocStatus);
......@@ -4186,7 +4186,7 @@ s_MgrMakeAssocResponse(
memcpy(sFrame.pSuppRates,
pCurrSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrSuppRates)->len + WLAN_IEHDR_LEN
);
);
if (((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len != 0) {
sFrame.pExtSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len);
......@@ -4194,7 +4194,7 @@ s_MgrMakeAssocResponse(
memcpy(sFrame.pExtSuppRates,
pCurrExtSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len + WLAN_IEHDR_LEN
);
);
}
// Adjust the length fields
......@@ -4214,7 +4214,7 @@ s_MgrMakeAssocResponse(
* Return Value:
* PTR to frame; or NULL on allocation failure
*
-*/
-*/
PSTxMgmtPacket
......@@ -4227,7 +4227,7 @@ s_MgrMakeReAssocResponse(
unsigned char *pDstAddr,
PWLAN_IE_SUPP_RATES pCurrSuppRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
)
)
{
PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_REASSOCRESP sFrame;
......@@ -4245,10 +4245,10 @@ s_MgrMakeReAssocResponse(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_MGR) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_REASSOCRESP)
));
memcpy( sFrame.pHdr->sA3.abyAddr1, pDstAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
));
memcpy(sFrame.pHdr->sA3.abyAddr1, pDstAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
*sFrame.pwCapInfo = cpu_to_le16(wCurrCapInfo);
*sFrame.pwStatus = cpu_to_le16(wAssocStatus);
......@@ -4260,7 +4260,7 @@ s_MgrMakeReAssocResponse(
memcpy(sFrame.pSuppRates,
pCurrSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrSuppRates)->len + WLAN_IEHDR_LEN
);
);
if (((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len != 0) {
sFrame.pExtSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len);
......@@ -4268,7 +4268,7 @@ s_MgrMakeReAssocResponse(
memcpy(sFrame.pExtSuppRates,
pCurrExtSuppRates,
((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len + WLAN_IEHDR_LEN
);
);
}
// Adjust the length fields
......@@ -4288,7 +4288,7 @@ s_MgrMakeReAssocResponse(
* Return Value:
* none.
*
-*/
-*/
static
void
......@@ -4296,7 +4296,7 @@ s_vMgrRxProbeResponse(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
)
)
{
PKnownBSS pBSSList = NULL;
WLAN_FR_PROBERESP sFrame;
......@@ -4322,7 +4322,7 @@ s_vMgrRxProbeResponse(
return;
}
if(sFrame.pSSID->len == 0)
if (sFrame.pSSID->len == 0)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx Probe resp: SSID len = 0 \n");
if (sFrame.pDSParms != 0) {
......@@ -4343,7 +4343,7 @@ s_vMgrRxProbeResponse(
}
//2008-0730-01<Add>by MikeLiu
if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
if (ChannelExceedZoneType(pDevice, byCurrChannel) == true)
return;
if (sFrame.pERP != NULL) {
......@@ -4376,10 +4376,10 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
sFrame.len - WLAN_HDR_ADDR3_LEN,
sFrame.pHdr->sA4.abyAddr4, // payload of probresponse
(void *)pRxPacket
);
);
}
else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Probe resp/insert: RxChannel = : %d\n", byCurrChannel);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe resp/insert: RxChannel = : %d\n", byCurrChannel);
BSSbInsertToBSSList((void *)pDevice,
sFrame.pHdr->sA3.abyAddr3,
*sFrame.pqwTimestamp,
......@@ -4397,7 +4397,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
sFrame.len - WLAN_HDR_ADDR3_LEN,
sFrame.pHdr->sA4.abyAddr4, // payload of beacon
(void *)pRxPacket
);
);
}
return;
......@@ -4412,7 +4412,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
* Return Value:
* none.
*
-*/
-*/
static
......@@ -4421,7 +4421,7 @@ s_vMgrRxProbeRequest(
PSDevice pDevice,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
)
)
{
WLAN_FR_PROBEREQ sFrame;
CMD_STATUS Status;
......@@ -4471,8 +4471,8 @@ s_vMgrRxProbeRequest(
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
byPHYType
);
if (pTxPacket != NULL ){
);
if (pTxPacket != NULL) {
/* send the frame */
Status = csMgmt_xmit(pDevice, pTxPacket);
if (Status != CMD_STATUS_PENDING) {
......@@ -4503,7 +4503,7 @@ s_vMgrRxProbeRequest(
* Return Value:
* none.
*
-*/
-*/
void
......@@ -4511,7 +4511,7 @@ vMgrRxManagePacket(
void *hDeviceContext,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
bool bInScan = false;
......@@ -4525,7 +4525,7 @@ vMgrRxManagePacket(
eNodeState = pMgmt->sNodeDBTable[uNodeIndex].eNodeState;
}
switch( WLAN_GET_FC_FSTYPE((pRxPacket->p80211Header->sA3.wFrameCtl)) ){
switch (WLAN_GET_FC_FSTYPE((pRxPacket->p80211Header->sA3.wFrameCtl))) {
case WLAN_FSTYPE_ASSOCREQ:
// Frame Clase = 2
......@@ -4538,7 +4538,7 @@ vMgrRxManagePacket(
pRxPacket->p80211Header->sA3.abyAddr2,
(6),
&Status
);
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 1\n");
}
else {
......@@ -4565,7 +4565,7 @@ vMgrRxManagePacket(
pRxPacket->p80211Header->sA3.abyAddr2,
(6),
&Status
);
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 2\n");
}
......@@ -4616,7 +4616,7 @@ vMgrRxManagePacket(
pRxPacket->p80211Header->sA3.abyAddr2,
(6),
&Status
);
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 3\n");
}
s_vMgrRxDisassociation(pDevice, pMgmt, pRxPacket);
......@@ -4654,18 +4654,18 @@ vMgrRxManagePacket(
* Return Value:
* true if success; false if failed.
*
-*/
-*/
bool
bMgrPrepareBeaconToSend(
void *hDeviceContext,
PSMgmtObject pMgmt
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSTxMgmtPacket pTxPacket;
// pDevice->bBeaconBufReady = false;
if (pDevice->bEncryptionEnable || pDevice->bEnable8021x){
if (pDevice->bEncryptionEnable || pDevice->bEnable8021x) {
pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1);
}
else {
......@@ -4683,7 +4683,7 @@ bMgrPrepareBeaconToSend(
(unsigned char *)pMgmt->abyCurrBSSID,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates
);
);
if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
(pMgmt->abyCurrBSSID[0] == 0))
......@@ -4708,15 +4708,15 @@ bMgrPrepareBeaconToSend(
* Return Value:
* none.
*
-*/
-*/
static
void
s_vMgrLogStatus(
PSMgmtObject pMgmt,
unsigned short wStatus
)
)
{
switch( wStatus ){
switch (wStatus) {
case WLAN_MGMT_STATUS_UNSPEC_FAILURE:
DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Unspecified error.\n");
break;
......@@ -4778,19 +4778,19 @@ s_vMgrLogStatus(
*
* Return Value: none.
*
-*/
-*/
bool
bAdd_PMKID_Candidate (
bAdd_PMKID_Candidate(
void *hDeviceContext,
unsigned char *pbyBSSID,
PSRSNCapObject psRSNCapObj
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PPMKID_CANDIDATE pCandidateList;
unsigned int ii = 0;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
if ((pDevice == NULL) || (pbyBSSID == NULL) || (psRSNCapObj == NULL))
return false;
......@@ -4803,7 +4803,7 @@ bAdd_PMKID_Candidate (
// Update Old Candidate
for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {
pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];
if ( !memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) {
if (!memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) {
if ((psRSNCapObj->bRSNCapExist == true) && (psRSNCapObj->wRSNCap & BIT0)) {
pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;
} else {
......@@ -4822,7 +4822,7 @@ bAdd_PMKID_Candidate (
}
memcpy(pCandidateList->BSSID, pbyBSSID, ETH_ALEN);
pDevice->gsPMKIDCandidate.NumCandidates++;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
return true;
}
......@@ -4839,11 +4839,11 @@ bAdd_PMKID_Candidate (
*
* Return Value: none.
*
-*/
-*/
void
vFlush_PMKID_Candidate (
vFlush_PMKID_Candidate(
void *hDeviceContext
)
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
......@@ -4854,12 +4854,12 @@ vFlush_PMKID_Candidate (
}
static bool
s_bCipherMatch (
s_bCipherMatch(
PKnownBSS pBSSNode,
NDIS_802_11_ENCRYPTION_STATUS EncStatus,
unsigned char *pbyCCSPK,
unsigned char *pbyCCSGK
)
)
{
unsigned char byMulticastCipher = KEY_CTL_INVALID;
unsigned char byCipherMask = 0x00;
......@@ -4878,7 +4878,7 @@ s_bCipherMatch (
if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&
(pBSSNode->bWPA2Valid == true) &&
//20080123-01,<Add> by Einsn Liu
((EncStatus == Ndis802_11Encryption3Enabled)||(EncStatus == Ndis802_11Encryption2Enabled))) {
((EncStatus == Ndis802_11Encryption3Enabled) || (EncStatus == Ndis802_11Encryption2Enabled))) {
//WPA2
// check Group Key Cipher
if ((pBSSNode->byCSSGK == WLAN_11i_CSS_WEP40) ||
......@@ -4893,7 +4893,7 @@ s_bCipherMatch (
}
// check Pairwise Key Cipher
for(i=0;i<pBSSNode->wCSSPKCount;i++) {
for (i = 0; i < pBSSNode->wCSSPKCount; i++) {
if ((pBSSNode->abyCSSPK[i] == WLAN_11i_CSS_WEP40) ||
(pBSSNode->abyCSSPK[i] == WLAN_11i_CSS_WEP104)) {
// this should not happen as defined 802.11i
......@@ -4926,7 +4926,7 @@ s_bCipherMatch (
}
// check Pairwise Key Cipher
for(i=0;i<pBSSNode->wPKCount;i++) {
for (i = 0; i < pBSSNode->wPKCount; i++) {
if (pBSSNode->abyPKType[i] == WPA_TKIP) {
byCipherMask |= 0x02;
} else if (pBSSNode->abyPKType[i] == WPA_AESCCMP) {
......@@ -4939,7 +4939,7 @@ s_bCipherMatch (
}
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%d, %d, %d, %d, EncStatus:%d\n",
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%d, %d, %d, %d, EncStatus:%d\n",
byMulticastCipher, byCipherMask, pBSSNode->bWPAValid, pBSSNode->bWPA2Valid, EncStatus);
// mask our cap. with BSS
......
drivers/staging/vt6655/wmgr.h
View file @ cb850a64
......@@ -82,7 +82,7 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
#define timer_expire(timer,next_tick) mod_timer(&timer, RUN_AT(next_tick))
#define timer_expire(timer, next_tick) mod_timer(&timer, RUN_AT(next_tick))
typedef void (*TimerFunction)(unsigned long);
......@@ -129,7 +129,7 @@ typedef struct tagSAssocInfo {
/*
typedef enum tagWMAC_AUTHENTICATION_MODE {
typedef enum tagWMAC_AUTHENTICATION_MODE {
WMAC_AUTH_OPEN,
......@@ -143,19 +143,19 @@ typedef enum tagWMAC_AUTHENTICATION_MODE {
WMAC_AUTH_MAX // Not a real mode, defined as upper bound
} WMAC_AUTHENTICATION_MODE, *PWMAC_AUTHENTICATION_MODE;
} WMAC_AUTHENTICATION_MODE, *PWMAC_AUTHENTICATION_MODE;
*/
// Pre-configured Mode (from XP)
/*
typedef enum tagWMAC_CONFIG_MODE {
typedef enum tagWMAC_CONFIG_MODE {
WMAC_CONFIG_ESS_STA,
WMAC_CONFIG_IBSS_STA,
WMAC_CONFIG_AUTO,
WMAC_CONFIG_AP
} WMAC_CONFIG_MODE, *PWMAC_CONFIG_MODE;
} WMAC_CONFIG_MODE, *PWMAC_CONFIG_MODE;
*/
typedef enum tagWMAC_SCAN_TYPE {
......@@ -210,13 +210,13 @@ typedef enum tagWMAC_CURRENT_MODE {
} WMAC_CURRENT_MODE, *PWMAC_CURRENT_MODE;
/*
typedef enum tagWMAC_POWER_MODE {
typedef enum tagWMAC_POWER_MODE {
WMAC_POWER_CAM,
WMAC_POWER_FAST,
WMAC_POWER_MAX
} WMAC_POWER_MODE, *PWMAC_POWER_MODE;
} WMAC_POWER_MODE, *PWMAC_POWER_MODE;
*/
......@@ -249,7 +249,7 @@ typedef struct tagSRxMgmtPacket {
typedef struct tagSMgmtObject
{
void * pAdapter;
void *pAdapter;
// MAC address
unsigned char abyMACAddr[WLAN_ADDR_LEN];
......@@ -402,31 +402,31 @@ typedef struct tagSMgmtObject
void
vMgrObjectInit(
void *hDeviceContext
);
);
void
vMgrTimerInit(
void *hDeviceContext
);
);
void
vMgrObjectReset(
void *hDeviceContext
);
);
void
vMgrAssocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
);
void
vMgrReAssocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
);
void
vMgrDisassocBeginSta(
......@@ -435,40 +435,40 @@ vMgrDisassocBeginSta(
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
);
);
void
vMgrAuthenBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
);
void
vMgrCreateOwnIBSS(
void *hDeviceContext,
PCMD_STATUS pStatus
);
);
void
vMgrJoinBSSBegin(
void *hDeviceContext,
PCMD_STATUS pStatus
);
);
void
vMgrRxManagePacket(
void *hDeviceContext,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
);
/*
void
vMgrScanBegin(
void
vMgrScanBegin(
void *hDeviceContext,
PCMD_STATUS pStatus
);
);
*/
void
......@@ -478,25 +478,25 @@ vMgrDeAuthenBeginSta(
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
);
);
bool
bMgrPrepareBeaconToSend(
void *hDeviceContext,
PSMgmtObject pMgmt
);
);
bool
bAdd_PMKID_Candidate (
bAdd_PMKID_Candidate(
void *hDeviceContext,
unsigned char *pbyBSSID,
PSRSNCapObject psRSNCapObj
);
);
void
vFlush_PMKID_Candidate (
vFlush_PMKID_Candidate(
void *hDeviceContext
);
);
#endif // __WMGR_H__
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7