Commit 0863b4e2 authored by Simon Schuster's avatar Simon Schuster Committed by Greg Kroah-Hartman

Staging: vt6656: Fix indentation of bssdb.c

Corrects indentation by using tabs instead of spaces. This also
includes modification of the alignment of multi-line expressions and
statements.
Signed-off-by: default avatarSebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de>
Signed-off-by: default avatarSimon Schuster <linux@rationality.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6e8e3a4
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* BSSvCreateOneNode - Allocate an Node for Node DB * BSSvCreateOneNode - Allocate an Node for Node DB
* BSSvUpdateAPNode - Update AP Node content in Index 0 of KnownNodeDB * BSSvUpdateAPNode - Update AP Node content in Index 0 of KnownNodeDB
* BSSvSecondCallBack - One second timer callback function to update Node DB info & AP link status * BSSvSecondCallBack - One second timer callback function to update Node DB info & AP link status
* BSSvUpdateNodeTxCounter - Update Tx attemps, Tx failure counter in Node DB for auto-fall back rate control * BSSvUpdateNodeTxCounter - Update Tx attemps, Tx failure counter in Node DB for auto-fallback rate control
* *
* Revision History: * Revision History:
* *
...@@ -209,7 +209,7 @@ PKnownBSS BSSpSearchBSSList(struct vnt_private *pDevice, ...@@ -209,7 +209,7 @@ PKnownBSS BSSpSearchBSSList(struct vnt_private *pDevice,
} }
} }
pDevice->bSameBSSMaxNum = jj; pDevice->bSameBSSMaxNum = jj;
if (pSelect != NULL) { if (pSelect != NULL) {
pSelect->bSelected = true; pSelect->bSelected = true;
...@@ -245,10 +245,14 @@ void BSSvClearBSSList(struct vnt_private *pDevice, int bKeepCurrBSSID) ...@@ -245,10 +245,14 @@ void BSSvClearBSSList(struct vnt_private *pDevice, int bKeepCurrBSSID)
if (pMgmt->sBSSList[ii].bActive && if (pMgmt->sBSSList[ii].bActive &&
ether_addr_equal(pMgmt->sBSSList[ii].abyBSSID, ether_addr_equal(pMgmt->sBSSList[ii].abyBSSID,
pMgmt->abyCurrBSSID)) { pMgmt->abyCurrBSSID)) {
//mike mark: there are two BSSID's in list. If that AP is in hidden ssid mode, one SSID is null,
// but other's might not be obvious, so if it associate's with your STA, //mike mark:
// you must keep the two of them!! //there are two BSSID's in list. If that AP is
// bKeepCurrBSSID = false; //in hidden ssid mode, one SSID is null, but
//other's might not be obvious, so if it
//associate's with your STA, you must keep the
//two of them!! bKeepCurrBSSID = false;
continue; continue;
} }
} }
...@@ -269,7 +273,8 @@ void BSSvClearBSSList(struct vnt_private *pDevice, int bKeepCurrBSSID) ...@@ -269,7 +273,8 @@ void BSSvClearBSSList(struct vnt_private *pDevice, int bKeepCurrBSSID)
* *
-*/ -*/
PKnownBSS BSSpAddrIsInBSSList(struct vnt_private *pDevice, PKnownBSS BSSpAddrIsInBSSList(struct vnt_private *pDevice,
u8 *abyBSSID, PWLAN_IE_SSID pSSID) u8 *abyBSSID,
PWLAN_IE_SSID pSSID)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
PKnownBSS pBSSList = NULL; PKnownBSS pBSSList = NULL;
...@@ -616,7 +621,8 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice, ...@@ -616,7 +621,8 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice,
-*/ -*/
int BSSbIsSTAInNodeDB(struct vnt_private *pDevice, int BSSbIsSTAInNodeDB(struct vnt_private *pDevice,
u8 *abyDstAddr, u32 *puNodeIndex) u8 *abyDstAddr,
u32 *puNodeIndex)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
unsigned int ii; unsigned int ii;
...@@ -727,8 +733,10 @@ void BSSvRemoveOneNode(struct vnt_private *pDevice, u32 uNodeIndex) ...@@ -727,8 +733,10 @@ void BSSvRemoveOneNode(struct vnt_private *pDevice, u32 uNodeIndex)
* *
-*/ -*/
void BSSvUpdateAPNode(struct vnt_private *pDevice, u16 *pwCapInfo, void BSSvUpdateAPNode(struct vnt_private *pDevice,
PWLAN_IE_SUPP_RATES pSuppRates, PWLAN_IE_SUPP_RATES pExtSuppRates) u16 *pwCapInfo,
PWLAN_IE_SUPP_RATES pSuppRates,
PWLAN_IE_SUPP_RATES pExtSuppRates)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
u32 uRateLen = WLAN_RATES_MAXLEN; u32 uRateLen = WLAN_RATES_MAXLEN;
...@@ -753,8 +761,7 @@ void BSSvUpdateAPNode(struct vnt_private *pDevice, u16 *pwCapInfo, ...@@ -753,8 +761,7 @@ void BSSvUpdateAPNode(struct vnt_private *pDevice, u16 *pwCapInfo,
&(pMgmt->sNodeDBTable[0].wMaxSuppRate), &(pMgmt->sNodeDBTable[0].wMaxSuppRate),
&(pMgmt->sNodeDBTable[0].wSuppRate), &(pMgmt->sNodeDBTable[0].wSuppRate),
&(pMgmt->sNodeDBTable[0].byTopCCKBasicRate), &(pMgmt->sNodeDBTable[0].byTopCCKBasicRate),
&(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate) &(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate));
);
memcpy(pMgmt->sNodeDBTable[0].abyMACAddr, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); memcpy(pMgmt->sNodeDBTable[0].abyMACAddr, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
pMgmt->sNodeDBTable[0].wTxDataRate = pMgmt->sNodeDBTable[0].wMaxSuppRate; pMgmt->sNodeDBTable[0].wTxDataRate = pMgmt->sNodeDBTable[0].wMaxSuppRate;
pMgmt->sNodeDBTable[0].bShortPreamble = WLAN_GET_CAP_INFO_SHORTPREAMBLE(*pwCapInfo); pMgmt->sNodeDBTable[0].bShortPreamble = WLAN_GET_CAP_INFO_SHORTPREAMBLE(*pwCapInfo);
...@@ -794,8 +801,7 @@ void BSSvAddMulticastNode(struct vnt_private *pDevice) ...@@ -794,8 +801,7 @@ void BSSvAddMulticastNode(struct vnt_private *pDevice)
&(pMgmt->sNodeDBTable[0].wMaxSuppRate), &(pMgmt->sNodeDBTable[0].wMaxSuppRate),
&(pMgmt->sNodeDBTable[0].wSuppRate), &(pMgmt->sNodeDBTable[0].wSuppRate),
&(pMgmt->sNodeDBTable[0].byTopCCKBasicRate), &(pMgmt->sNodeDBTable[0].byTopCCKBasicRate),
&(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate) &(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate));
);
pMgmt->sNodeDBTable[0].wTxDataRate = pMgmt->sNodeDBTable[0].wMaxBasicRate; pMgmt->sNodeDBTable[0].wTxDataRate = pMgmt->sNodeDBTable[0].wMaxBasicRate;
pMgmt->sNodeDBTable[0].uRatePollTimeout = FALLBACK_POLL_SECOND; pMgmt->sNodeDBTable[0].uRatePollTimeout = FALLBACK_POLL_SECOND;
...@@ -852,7 +858,7 @@ void BSSvSecondCallBack(struct work_struct *work) ...@@ -852,7 +858,7 @@ void BSSvSecondCallBack(struct work_struct *work)
pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1)); pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
} }
if(pDevice->byReAssocCount > 0) { if(pDevice->byReAssocCount > 0) {
pDevice->byReAssocCount++; pDevice->byReAssocCount++;
if((pDevice->byReAssocCount > 10) && (pDevice->bLinkPass != true)) { //10 sec timeout if((pDevice->byReAssocCount > 10) && (pDevice->bLinkPass != true)) { //10 sec timeout
printk("Re-association timeout!!!\n"); printk("Re-association timeout!!!\n");
...@@ -868,7 +874,7 @@ if(pDevice->byReAssocCount > 0) { ...@@ -868,7 +874,7 @@ if(pDevice->byReAssocCount > 0) {
} }
else if(pDevice->bLinkPass == true) else if(pDevice->bLinkPass == true)
pDevice->byReAssocCount = 0; pDevice->byReAssocCount = 0;
} }
pMgmt->eLastState = pMgmt->eCurrState ; pMgmt->eLastState = pMgmt->eCurrState ;
...@@ -1043,10 +1049,10 @@ if(pDevice->byReAssocCount > 0) { ...@@ -1043,10 +1049,10 @@ if(pDevice->byReAssocCount > 0) {
} }
} }
else if (pItemSSID->len != 0) { else if (pItemSSID->len != 0) {
//Davidwang //Davidwang
if ((pDevice->bEnableRoaming == true)&&(!(pMgmt->Cisco_cckm))) { if ((pDevice->bEnableRoaming == true)&&(!(pMgmt->Cisco_cckm))) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bRoaming %d, !\n", pDevice->bRoaming ); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bRoaming %d, !\n", pDevice->bRoaming );
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming ); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
if ((pDevice->bRoaming == true)&&(pDevice->bIsRoaming == true)){ if ((pDevice->bRoaming == true)&&(pDevice->bIsRoaming == true)){
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Fast Roaming ...\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Fast Roaming ...\n");
BSSvClearBSSList((void *) pDevice, pDevice->bLinkPass); BSSvClearBSSList((void *) pDevice, pDevice->bLinkPass);
...@@ -1065,9 +1071,8 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming ); ...@@ -1065,9 +1071,8 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
if (pDevice->uIsroamingTime >= 20) if (pDevice->uIsroamingTime >= 20)
pDevice->bIsRoaming = false; pDevice->bIsRoaming = false;
} }
} }
else { else {
if (pDevice->uAutoReConnectTime < 10) { if (pDevice->uAutoReConnectTime < 10) {
pDevice->uAutoReConnectTime++; pDevice->uAutoReConnectTime++;
//network manager support need not do Roaming scan??? //network manager support need not do Roaming scan???
......
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