staging:vt6655:vntwifi: Whitespace cleanups
authorJoe Perches <joe@perches.com>
Mon, 18 Mar 2013 17:45:08 +0000 (10:45 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Mar 2013 00:21:38 +0000 (17:21 -0700)
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/vntwifi.c
drivers/staging/vt6655/vntwifi.h

index 62c44b8..221c890 100644 (file)
  *
  * Return Value: none
  *
--*/
+ -*/
 void
-VNTWIFIvSetOPMode (
-    void *pMgmtHandle,
-    WMAC_CONFIG_MODE eOPMode
-    )
+VNTWIFIvSetOPMode(
+       void *pMgmtHandle,
+       WMAC_CONFIG_MODE eOPMode
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
 
-    pMgmt->eConfigMode = eOPMode;
+       pMgmt->eConfigMode = eOPMode;
 }
 
 
@@ -95,20 +95,20 @@ VNTWIFIvSetOPMode (
  *
  * Return Value: none
  *
--*/
+ -*/
 void
-VNTWIFIvSetIBSSParameter (
-    void *pMgmtHandle,
-    unsigned short wBeaconPeriod,
-    unsigned short wATIMWindow,
-    unsigned int uChannel
-    )
+VNTWIFIvSetIBSSParameter(
+       void *pMgmtHandle,
+       unsigned short wBeaconPeriod,
+       unsigned short wATIMWindow,
+       unsigned int uChannel
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
 
-    pMgmt->wIBSSBeaconPeriod = wBeaconPeriod;
-    pMgmt->wIBSSATIMWindow = wATIMWindow;
-    pMgmt->uIBSSChannel = uChannel;
+       pMgmt->wIBSSBeaconPeriod = wBeaconPeriod;
+       pMgmt->wIBSSATIMWindow = wATIMWindow;
+       pMgmt->uIBSSChannel = uChannel;
 }
 
 /*+
@@ -124,14 +124,14 @@ VNTWIFIvSetIBSSParameter (
  *
  * Return Value: current SSID pointer.
  *
--*/
+ -*/
 PWLAN_IE_SSID
-VNTWIFIpGetCurrentSSID (
-    void *pMgmtHandle
-    )
+VNTWIFIpGetCurrentSSID(
+       void *pMgmtHandle
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-    return((PWLAN_IE_SSID) pMgmt->abyCurrSSID);
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+       return((PWLAN_IE_SSID) pMgmt->abyCurrSSID);
 }
 
 /*+
@@ -147,17 +147,17 @@ VNTWIFIpGetCurrentSSID (
  *
  * Return Value: current Channel.
  *
--*/
+ -*/
 unsigned int
-VNTWIFIpGetCurrentChannel (
-    void *pMgmtHandle
-    )
+VNTWIFIpGetCurrentChannel(
+       void *pMgmtHandle
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-    if (pMgmtHandle != NULL) {
-        return (pMgmt->uCurrChannel);
-    }
-    return 0;
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+       if (pMgmtHandle != NULL) {
+               return (pMgmt->uCurrChannel);
+       }
+       return 0;
 }
 
 /*+
@@ -173,14 +173,14 @@ VNTWIFIpGetCurrentChannel (
  *
  * Return Value: current Assoc ID
  *
--*/
+ -*/
 unsigned short
-VNTWIFIwGetAssocID (
-    void *pMgmtHandle
-    )
+VNTWIFIwGetAssocID(
+       void *pMgmtHandle
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-    return(pMgmt->wCurrAID);
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+       return(pMgmt->wCurrAID);
 }
 
 
@@ -199,35 +199,35 @@ VNTWIFIwGetAssocID (
  *
  * Return Value: max support rate
  *
--*/
+ -*/
 unsigned char
-VNTWIFIbyGetMaxSupportRate (
-    PWLAN_IE_SUPP_RATES pSupportRateIEs,
-    PWLAN_IE_SUPP_RATES pExtSupportRateIEs
-    )
+VNTWIFIbyGetMaxSupportRate(
+       PWLAN_IE_SUPP_RATES pSupportRateIEs,
+       PWLAN_IE_SUPP_RATES pExtSupportRateIEs
+)
 {
-    unsigned char byMaxSupportRate = RATE_1M;
-    unsigned char bySupportRate = RATE_1M;
-    unsigned int ii = 0;
-
-    if (pSupportRateIEs) {
-        for (ii = 0; ii < pSupportRateIEs->len; ii++) {
-            bySupportRate = DATARATEbyGetRateIdx(pSupportRateIEs->abyRates[ii]);
-            if (bySupportRate > byMaxSupportRate) {
-                byMaxSupportRate = bySupportRate;
-            }
-        }
-    }
-    if (pExtSupportRateIEs) {
-        for (ii = 0; ii < pExtSupportRateIEs->len; ii++) {
-            bySupportRate = DATARATEbyGetRateIdx(pExtSupportRateIEs->abyRates[ii]);
-            if (bySupportRate > byMaxSupportRate) {
-                byMaxSupportRate = bySupportRate;
-            }
-        }
-    }
-
-    return byMaxSupportRate;
+       unsigned char byMaxSupportRate = RATE_1M;
+       unsigned char bySupportRate = RATE_1M;
+       unsigned int ii = 0;
+
+       if (pSupportRateIEs) {
+               for (ii = 0; ii < pSupportRateIEs->len; ii++) {
+                       bySupportRate = DATARATEbyGetRateIdx(pSupportRateIEs->abyRates[ii]);
+                       if (bySupportRate > byMaxSupportRate) {
+                               byMaxSupportRate = bySupportRate;
+                       }
+               }
+       }
+       if (pExtSupportRateIEs) {
+               for (ii = 0; ii < pExtSupportRateIEs->len; ii++) {
+                       bySupportRate = DATARATEbyGetRateIdx(pExtSupportRateIEs->abyRates[ii]);
+                       if (bySupportRate > byMaxSupportRate) {
+                               byMaxSupportRate = bySupportRate;
+                       }
+               }
+       }
+
+       return byMaxSupportRate;
 }
 
 /*+
@@ -245,48 +245,48 @@ VNTWIFIbyGetMaxSupportRate (
  *
  * Return Value: max support rate
  *
--*/
+ -*/
 unsigned char
-VNTWIFIbyGetACKTxRate (
-    unsigned char byRxDataRate,
-    PWLAN_IE_SUPP_RATES pSupportRateIEs,
-    PWLAN_IE_SUPP_RATES pExtSupportRateIEs
-    )
+VNTWIFIbyGetACKTxRate(
+       unsigned char byRxDataRate,
+       PWLAN_IE_SUPP_RATES pSupportRateIEs,
+       PWLAN_IE_SUPP_RATES pExtSupportRateIEs
+)
 {
-    unsigned char byMaxAckRate;
-    unsigned char byBasicRate;
-    unsigned int ii;
-
-    if (byRxDataRate <= RATE_11M) {
-        byMaxAckRate = RATE_1M;
-    } else  {
-        // 24M is mandatory for 802.11a and 802.11g
-        byMaxAckRate = RATE_24M;
-    }
-    if (pSupportRateIEs) {
-        for (ii = 0; ii < pSupportRateIEs->len; ii++) {
-            if (pSupportRateIEs->abyRates[ii] & 0x80) {
-                byBasicRate = DATARATEbyGetRateIdx(pSupportRateIEs->abyRates[ii]);
-                if ((byBasicRate <= byRxDataRate) &&
-                    (byBasicRate > byMaxAckRate))  {
-                    byMaxAckRate = byBasicRate;
-                }
-            }
-        }
-    }
-    if (pExtSupportRateIEs) {
-        for (ii = 0; ii < pExtSupportRateIEs->len; ii++) {
-            if (pExtSupportRateIEs->abyRates[ii] & 0x80) {
-                byBasicRate = DATARATEbyGetRateIdx(pExtSupportRateIEs->abyRates[ii]);
-                if ((byBasicRate <= byRxDataRate) &&
-                    (byBasicRate > byMaxAckRate))  {
-                    byMaxAckRate = byBasicRate;
-                }
-            }
-        }
-    }
-
-    return byMaxAckRate;
+       unsigned char byMaxAckRate;
+       unsigned char byBasicRate;
+       unsigned int ii;
+
+       if (byRxDataRate <= RATE_11M) {
+               byMaxAckRate = RATE_1M;
+       } else  {
+               // 24M is mandatory for 802.11a and 802.11g
+               byMaxAckRate = RATE_24M;
+       }
+       if (pSupportRateIEs) {
+               for (ii = 0; ii < pSupportRateIEs->len; ii++) {
+                       if (pSupportRateIEs->abyRates[ii] & 0x80) {
+                               byBasicRate = DATARATEbyGetRateIdx(pSupportRateIEs->abyRates[ii]);
+                               if ((byBasicRate <= byRxDataRate) &&
+                                   (byBasicRate > byMaxAckRate))  {
+                                       byMaxAckRate = byBasicRate;
+                               }
+                       }
+               }
+       }
+       if (pExtSupportRateIEs) {
+               for (ii = 0; ii < pExtSupportRateIEs->len; ii++) {
+                       if (pExtSupportRateIEs->abyRates[ii] & 0x80) {
+                               byBasicRate = DATARATEbyGetRateIdx(pExtSupportRateIEs->abyRates[ii]);
+                               if ((byBasicRate <= byRxDataRate) &&
+                                   (byBasicRate > byMaxAckRate))  {
+                                       byMaxAckRate = byBasicRate;
+                               }
+                       }
+               }
+       }
+
+       return byMaxAckRate;
 }
 
 /*+
@@ -303,22 +303,22 @@ VNTWIFIbyGetACKTxRate (
  *
  * Return Value: none
  *
--*/
+ -*/
 void
-VNTWIFIvSetAuthenticationMode (
-    void *pMgmtHandle,
-    WMAC_AUTHENTICATION_MODE eAuthMode
-    )
+VNTWIFIvSetAuthenticationMode(
+       void *pMgmtHandle,
+       WMAC_AUTHENTICATION_MODE eAuthMode
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-
-    pMgmt->eAuthenMode = eAuthMode;
-    if ((eAuthMode == WMAC_AUTH_SHAREKEY) ||
-        (eAuthMode == WMAC_AUTH_AUTO)) {
-        pMgmt->bShareKeyAlgorithm = true;
-    } else {
-        pMgmt->bShareKeyAlgorithm = false;
-    }
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+
+       pMgmt->eAuthenMode = eAuthMode;
+       if ((eAuthMode == WMAC_AUTH_SHAREKEY) ||
+           (eAuthMode == WMAC_AUTH_AUTO)) {
+               pMgmt->bShareKeyAlgorithm = true;
+       } else {
+               pMgmt->bShareKeyAlgorithm = false;
+       }
 }
 
 /*+
@@ -335,59 +335,59 @@ VNTWIFIvSetAuthenticationMode (
  *
  * Return Value: none
  *
--*/
+ -*/
 void
-VNTWIFIvSetEncryptionMode (
-    void *pMgmtHandle,
-    WMAC_ENCRYPTION_MODE eEncryptionMode
-    )
+VNTWIFIvSetEncryptionMode(
+       void *pMgmtHandle,
+       WMAC_ENCRYPTION_MODE eEncryptionMode
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-
-    pMgmt->eEncryptionMode = eEncryptionMode;
-    if ((eEncryptionMode == WMAC_ENCRYPTION_WEPEnabled) ||
-        (eEncryptionMode == WMAC_ENCRYPTION_TKIPEnabled) ||
-        (eEncryptionMode == WMAC_ENCRYPTION_AESEnabled) ) {
-        pMgmt->bPrivacyInvoked = true;
-    } else {
-        pMgmt->bPrivacyInvoked = false;
-    }
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+
+       pMgmt->eEncryptionMode = eEncryptionMode;
+       if ((eEncryptionMode == WMAC_ENCRYPTION_WEPEnabled) ||
+           (eEncryptionMode == WMAC_ENCRYPTION_TKIPEnabled) ||
+           (eEncryptionMode == WMAC_ENCRYPTION_AESEnabled)) {
+               pMgmt->bPrivacyInvoked = true;
+       } else {
+               pMgmt->bPrivacyInvoked = false;
+       }
 }
 
 
 
 bool
-VNTWIFIbConfigPhyMode (
-    void *pMgmtHandle,
-    CARD_PHY_TYPE ePhyType
-    )
+VNTWIFIbConfigPhyMode(
+       void *pMgmtHandle,
+       CARD_PHY_TYPE ePhyType
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-
-    if ((ePhyType != PHY_TYPE_AUTO) &&
-        (ePhyType != pMgmt->eCurrentPHYMode)) {
-        if (CARDbSetPhyParameter(pMgmt->pAdapter, ePhyType, 0, 0, NULL, NULL)==true) {
-            pMgmt->eCurrentPHYMode = ePhyType;
-        } else {
-            return(false);
-        }
-    }
-    pMgmt->eConfigPHYMode = ePhyType;
-    return(true);
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+
+       if ((ePhyType != PHY_TYPE_AUTO) &&
+           (ePhyType != pMgmt->eCurrentPHYMode)) {
+               if (CARDbSetPhyParameter(pMgmt->pAdapter, ePhyType, 0, 0, NULL, NULL) == true) {
+                       pMgmt->eCurrentPHYMode = ePhyType;
+               } else {
+                       return(false);
+               }
+       }
+       pMgmt->eConfigPHYMode = ePhyType;
+       return(true);
 }
 
 
 void
-VNTWIFIbGetConfigPhyMode (
-    void *pMgmtHandle,
-    void *pePhyType
-    )
+VNTWIFIbGetConfigPhyMode(
+       void *pMgmtHandle,
+       void *pePhyType
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
 
-    if ((pMgmt != NULL) && (pePhyType != NULL)) {
-        *(PCARD_PHY_TYPE)pePhyType = pMgmt->eConfigPHYMode;
-    }
+       if ((pMgmt != NULL) && (pePhyType != NULL)) {
+               *(PCARD_PHY_TYPE)pePhyType = pMgmt->eConfigPHYMode;
+       }
 }
 
 /*+
@@ -403,7 +403,7 @@ VNTWIFIbGetConfigPhyMode (
  *
  * Return Value: None.
  *
--*/
+ -*/
 
 
 /*+
@@ -420,56 +420,56 @@ VNTWIFIbGetConfigPhyMode (
  *
  * Return Value: None.
  *
--*/
+ -*/
 
 void
 VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirstBSS)
 {
-    unsigned int ii = 0;
-    PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
-    PKnownBSS       pBSS = NULL;
-    unsigned int uCount = 0;
-
-    *pvFirstBSS = NULL;
-
-    for (ii = 0; ii < MAX_BSS_NUM; ii++) {
-        pBSS = &(pMgmt->sBSSList[ii]);
-        if (!pBSS->bActive) {
-            continue;
-        }
-        if (*pvFirstBSS == NULL) {
-            *pvFirstBSS = &(pMgmt->sBSSList[ii]);
-        }
-        uCount++;
-    }
-    *puBSSCount = uCount;
+       unsigned int ii = 0;
+       PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
+       PKnownBSS       pBSS = NULL;
+       unsigned int uCount = 0;
+
+       *pvFirstBSS = NULL;
+
+       for (ii = 0; ii < MAX_BSS_NUM; ii++) {
+               pBSS = &(pMgmt->sBSSList[ii]);
+               if (!pBSS->bActive) {
+                       continue;
+               }
+               if (*pvFirstBSS == NULL) {
+                       *pvFirstBSS = &(pMgmt->sBSSList[ii]);
+               }
+               uCount++;
+       }
+       *puBSSCount = uCount;
 }
 
 
 
 
 void
-VNTWIFIvGetNextBSS (
-    void *pMgmtHandle,
-    void *pvCurrentBSS,
-    void **pvNextBSS
-    )
+VNTWIFIvGetNextBSS(
+       void *pMgmtHandle,
+       void *pvCurrentBSS,
+       void **pvNextBSS
+)
 {
-    PKnownBSS       pBSS = (PKnownBSS) pvCurrentBSS;
-    PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
-
-    *pvNextBSS = NULL;
-
-    while (*pvNextBSS == NULL) {
-        pBSS++;
-        if (pBSS > &(pMgmt->sBSSList[MAX_BSS_NUM])) {
-            return;
-        }
-        if (pBSS->bActive == true) {
-            *pvNextBSS = pBSS;
-            return;
-        }
-    }
+       PKnownBSS       pBSS = (PKnownBSS) pvCurrentBSS;
+       PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
+
+       *pvNextBSS = NULL;
+
+       while (*pvNextBSS == NULL) {
+               pBSS++;
+               if (pBSS > &(pMgmt->sBSSList[MAX_BSS_NUM])) {
+                       return;
+               }
+               if (pBSS->bActive == true) {
+                       *pvNextBSS = pBSS;
+                       return;
+               }
+       }
 }
 
 
@@ -487,319 +487,319 @@ VNTWIFIvGetNextBSS (
  *
  * Return Value: none
  *
--*/
+ -*/
 void
 VNTWIFIvUpdateNodeTxCounter(
-    void *pMgmtHandle,
-    unsigned char *pbyDestAddress,
-    bool bTxOk,
-    unsigned short wRate,
-    unsigned char *pbyTxFailCount
-    )
+       void *pMgmtHandle,
+       unsigned char *pbyDestAddress,
+       bool bTxOk,
+       unsigned short wRate,
+       unsigned char *pbyTxFailCount
+)
 {
-    PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
-    unsigned int uNodeIndex = 0;
-    unsigned int ii;
-
-    if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
-        (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
-        if (BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex) == false) {
-            return;
-        }
-    }
-    pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts++;
-    if (bTxOk == true) {
-        // transmit success, TxAttempts at least plus one
-        pMgmt->sNodeDBTable[uNodeIndex].uTxOk[MAX_RATE]++;
-        pMgmt->sNodeDBTable[uNodeIndex].uTxOk[wRate]++;
-    } else {
-        pMgmt->sNodeDBTable[uNodeIndex].uTxFailures++;
-    }
-    pMgmt->sNodeDBTable[uNodeIndex].uTxRetry += pbyTxFailCount[MAX_RATE];
-    for(ii=0;ii<MAX_RATE;ii++) {
-        pMgmt->sNodeDBTable[uNodeIndex].uTxFail[ii] += pbyTxFailCount[ii];
-    }
-    return;
+       PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
+       unsigned int uNodeIndex = 0;
+       unsigned int ii;
+
+       if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
+           (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
+               if (BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex) == false) {
+                       return;
+               }
+       }
+       pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts++;
+       if (bTxOk == true) {
+               // transmit success, TxAttempts at least plus one
+               pMgmt->sNodeDBTable[uNodeIndex].uTxOk[MAX_RATE]++;
+               pMgmt->sNodeDBTable[uNodeIndex].uTxOk[wRate]++;
+       } else {
+               pMgmt->sNodeDBTable[uNodeIndex].uTxFailures++;
+       }
+       pMgmt->sNodeDBTable[uNodeIndex].uTxRetry += pbyTxFailCount[MAX_RATE];
+       for (ii = 0; ii < MAX_RATE; ii++) {
+               pMgmt->sNodeDBTable[uNodeIndex].uTxFail[ii] += pbyTxFailCount[ii];
+       }
+       return;
 }
 
 
 void
 VNTWIFIvGetTxRate(
-    void *pMgmtHandle,
-    unsigned char *pbyDestAddress,
-    unsigned short *pwTxDataRate,
-    unsigned char *pbyACKRate,
-    unsigned char *pbyCCKBasicRate,
-    unsigned char *pbyOFDMBasicRate
-    )
+       void *pMgmtHandle,
+       unsigned char *pbyDestAddress,
+       unsigned short *pwTxDataRate,
+       unsigned char *pbyACKRate,
+       unsigned char *pbyCCKBasicRate,
+       unsigned char *pbyOFDMBasicRate
+)
 {
-    PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-    unsigned int uNodeIndex = 0;
-    unsigned short wTxDataRate = RATE_1M;
-    unsigned char byACKRate = RATE_1M;
-    unsigned char byCCKBasicRate = RATE_1M;
-    unsigned char byOFDMBasicRate = RATE_24M;
-    PWLAN_IE_SUPP_RATES pSupportRateIEs = NULL;
-    PWLAN_IE_SUPP_RATES pExtSupportRateIEs = NULL;
-
-
-    if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
-        (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
-        // Adhoc Tx rate decided from node DB
-        if(BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex)) {
-            wTxDataRate = (pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate);
-            pSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrSuppRates);
-            pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrExtSuppRates);
-        } else {
-            if (pMgmt->eCurrentPHYMode != PHY_TYPE_11A) {
-                wTxDataRate = RATE_2M;
-            } else {
-                wTxDataRate = RATE_24M;
-            }
-            pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates;
-            pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates;
-        }
-    } else { // Infrastructure: rate decided from AP Node, index = 0
+       PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
+       unsigned int uNodeIndex = 0;
+       unsigned short wTxDataRate = RATE_1M;
+       unsigned char byACKRate = RATE_1M;
+       unsigned char byCCKBasicRate = RATE_1M;
+       unsigned char byOFDMBasicRate = RATE_24M;
+       PWLAN_IE_SUPP_RATES pSupportRateIEs = NULL;
+       PWLAN_IE_SUPP_RATES pExtSupportRateIEs = NULL;
+
+
+       if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
+           (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
+               // Adhoc Tx rate decided from node DB
+               if (BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex)) {
+                       wTxDataRate = (pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate);
+                       pSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrSuppRates);
+                       pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrExtSuppRates);
+               } else {
+                       if (pMgmt->eCurrentPHYMode != PHY_TYPE_11A) {
+                               wTxDataRate = RATE_2M;
+                       } else {
+                               wTxDataRate = RATE_24M;
+                       }
+                       pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates;
+                       pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates;
+               }
+       } else { // Infrastructure: rate decided from AP Node, index = 0
 
                wTxDataRate = (pMgmt->sNodeDBTable[0].wTxDataRate);
 #ifdef PLICE_DEBUG
                printk(KERN_DEBUG "GetTxRate:AP MAC is %pM,TxRate is %d\n",
-                               pMgmt->sNodeDBTable[0].abyMACAddr, wTxDataRate);
+                      pMgmt->sNodeDBTable[0].abyMACAddr, wTxDataRate);
 #endif
 
 
-        pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates;
-        pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates;
-    }
-    byACKRate = VNTWIFIbyGetACKTxRate(  (unsigned char) wTxDataRate,
-                                        pSupportRateIEs,
-                                        pExtSupportRateIEs
-                                        );
-    if (byACKRate > (unsigned char) wTxDataRate) {
-        byACKRate = (unsigned char) wTxDataRate;
-    }
-    byCCKBasicRate = VNTWIFIbyGetACKTxRate( RATE_11M,
-                                            pSupportRateIEs,
-                                            pExtSupportRateIEs
-                                            );
-    byOFDMBasicRate = VNTWIFIbyGetACKTxRate(RATE_54M,
-                                            pSupportRateIEs,
-                                            pExtSupportRateIEs
-                                            );
-    *pwTxDataRate = wTxDataRate;
-    *pbyACKRate = byACKRate;
-    *pbyCCKBasicRate = byCCKBasicRate;
-    *pbyOFDMBasicRate = byOFDMBasicRate;
-    return;
+               pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates;
+               pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates;
+       }
+       byACKRate = VNTWIFIbyGetACKTxRate((unsigned char) wTxDataRate,
+                                           pSupportRateIEs,
+                                           pExtSupportRateIEs
+);
+       if (byACKRate > (unsigned char) wTxDataRate) {
+               byACKRate = (unsigned char) wTxDataRate;
+       }
+       byCCKBasicRate = VNTWIFIbyGetACKTxRate(RATE_11M,
+                                               pSupportRateIEs,
+                                               pExtSupportRateIEs
+);
+       byOFDMBasicRate = VNTWIFIbyGetACKTxRate(RATE_54M,
+                                               pSupportRateIEs,
+                                               pExtSupportRateIEs
+);
+       *pwTxDataRate = wTxDataRate;
+       *pbyACKRate = byACKRate;
+       *pbyCCKBasicRate = byCCKBasicRate;
+       *pbyOFDMBasicRate = byOFDMBasicRate;
+       return;
 }
 
 unsigned char
 VNTWIFIbyGetKeyCypher(
-    void *pMgmtHandle,
-    bool bGroupKey
-    )
+       void *pMgmtHandle,
+       bool bGroupKey
+)
 {
-    PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
+       PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
 
-    if (bGroupKey == true) {
-        return (pMgmt->byCSSGK);
-    } else {
-        return (pMgmt->byCSSPK);
-    }
+       if (bGroupKey == true) {
+               return (pMgmt->byCSSGK);
+       } else {
+               return (pMgmt->byCSSPK);
+       }
 }
 
 
 /*
-bool
-VNTWIFIbInit(
-    void *pAdapterHandler,
-    void **pMgmtHandler
-    )
-{
-
-    PSMgmtObject        pMgmt = NULL;
-    unsigned int ii;
-
-
-    pMgmt = (PSMgmtObject)kmalloc(sizeof(SMgmtObject), (int)GFP_ATOMIC);
-    if (pMgmt == NULL) {
-        *pMgmtHandler = NULL;
-        return false;
-    }
-
-    memset(pMgmt, 0, sizeof(SMgmtObject));
-    pMgmt->pAdapter = (void *) pAdapterHandler;
-
-    // should initial MAC address abyMACAddr
-    for(ii=0;ii<WLAN_BSSID_LEN;ii++) {
-        pMgmt->abyDesireBSSID[ii] = 0xFF;
-    }
-    pMgmt->pbyPSPacketPool = &pMgmt->byPSPacketPool[0];
-    pMgmt->pbyMgmtPacketPool = &pMgmt->byMgmtPacketPool[0];
-    pMgmt->byCSSPK = KEY_CTL_NONE;
-    pMgmt->byCSSGK = KEY_CTL_NONE;
-    pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI;
-
-    pMgmt->cbFreeCmdQueue = CMD_Q_SIZE;
-    pMgmt->uCmdDequeueIdx = 0;
-    pMgmt->uCmdEnqueueIdx = 0;
-    pMgmt->eCommandState = WLAN_CMD_STATE_IDLE;
-    pMgmt->bCmdStop = false;
-    pMgmt->bCmdRunning = false;
-
-    *pMgmtHandler = pMgmt;
-    return true;
-}
+  bool
+  VNTWIFIbInit(
+  void *pAdapterHandler,
+  void **pMgmtHandler
+)
+  {
+
+  PSMgmtObject        pMgmt = NULL;
+  unsigned int ii;
+
+
+  pMgmt = (PSMgmtObject)kmalloc(sizeof(SMgmtObject), (int)GFP_ATOMIC);
+  if (pMgmt == NULL) {
+  *pMgmtHandler = NULL;
+  return false;
+  }
+
+  memset(pMgmt, 0, sizeof(SMgmtObject));
+  pMgmt->pAdapter = (void *) pAdapterHandler;
+
+  // should initial MAC address abyMACAddr
+  for (ii=0; ii<WLAN_BSSID_LEN; ii++) {
+  pMgmt->abyDesireBSSID[ii] = 0xFF;
+  }
+  pMgmt->pbyPSPacketPool = &pMgmt->byPSPacketPool[0];
+  pMgmt->pbyMgmtPacketPool = &pMgmt->byMgmtPacketPool[0];
+  pMgmt->byCSSPK = KEY_CTL_NONE;
+  pMgmt->byCSSGK = KEY_CTL_NONE;
+  pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI;
+
+  pMgmt->cbFreeCmdQueue = CMD_Q_SIZE;
+  pMgmt->uCmdDequeueIdx = 0;
+  pMgmt->uCmdEnqueueIdx = 0;
+  pMgmt->eCommandState = WLAN_CMD_STATE_IDLE;
+  pMgmt->bCmdStop = false;
+  pMgmt->bCmdRunning = false;
+
+  *pMgmtHandler = pMgmt;
+  return true;
+  }
 */
 
 
 
 bool
-VNTWIFIbSetPMKIDCache (
-    void *pMgmtObject,
-    unsigned long ulCount,
-    void *pPMKIDInfo
-    )
+VNTWIFIbSetPMKIDCache(
+       void *pMgmtObject,
+       unsigned long ulCount,
+       void *pPMKIDInfo
+)
 {
-    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
-
-    if (ulCount > MAX_PMKID_CACHE) {
-        return (false);
-    }
-    pMgmt->gsPMKIDCache.BSSIDInfoCount = ulCount;
-    memcpy(pMgmt->gsPMKIDCache.BSSIDInfo, pPMKIDInfo, (ulCount*sizeof(PMKIDInfo)));
-    return (true);
+       PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
+
+       if (ulCount > MAX_PMKID_CACHE) {
+               return (false);
+       }
+       pMgmt->gsPMKIDCache.BSSIDInfoCount = ulCount;
+       memcpy(pMgmt->gsPMKIDCache.BSSIDInfo, pPMKIDInfo, (ulCount*sizeof(PMKIDInfo)));
+       return (true);
 }
 
 
 
 unsigned short
 VNTWIFIwGetMaxSupportRate(
-    void *pMgmtObject
-    )
+       void *pMgmtObject
+)
 {
-    unsigned short wRate = RATE_54M;
-    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
-
-    for(wRate = RATE_54M; wRate > RATE_1M; wRate--) {
-        if (pMgmt->sNodeDBTable[0].wSuppRate & (1<<wRate)) {
-            return (wRate);
-        }
-    }
-    if (pMgmt->eCurrentPHYMode == PHY_TYPE_11A) {
-        return (RATE_6M);
-    } else {
-        return (RATE_1M);
-    }
+       unsigned short wRate = RATE_54M;
+       PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
+
+       for (wRate = RATE_54M; wRate > RATE_1M; wRate--) {
+               if (pMgmt->sNodeDBTable[0].wSuppRate & (1<<wRate)) {
+                       return (wRate);
+               }
+       }
+       if (pMgmt->eCurrentPHYMode == PHY_TYPE_11A) {
+               return (RATE_6M);
+       } else {
+               return (RATE_1M);
+       }
 }
 
 
 void
-VNTWIFIvSet11h (
-    void *pMgmtObject,
-    bool b11hEnable
-    )
+VNTWIFIvSet11h(
+       void *pMgmtObject,
+       bool b11hEnable
+)
 {
-    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
+       PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
 
-    pMgmt->b11hEnable = b11hEnable;
+       pMgmt->b11hEnable = b11hEnable;
 }
 
 bool
 VNTWIFIbMeasureReport(
-    void *pMgmtObject,
-    bool bEndOfReport,
-    void *pvMeasureEID,
-    unsigned char byReportMode,
-    unsigned char byBasicMap,
-    unsigned char byCCAFraction,
-    unsigned char *pbyRPIs
-    )
+       void *pMgmtObject,
+       bool bEndOfReport,
+       void *pvMeasureEID,
+       unsigned char byReportMode,
+       unsigned char byBasicMap,
+       unsigned char byCCAFraction,
+       unsigned char *pbyRPIs
+)
 {
-    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
-    unsigned char *pbyCurrentEID = (unsigned char *) (pMgmt->pCurrMeasureEIDRep);
-
-    //spin_lock_irq(&pDevice->lock);
-    if ((pvMeasureEID != NULL) &&
-        (pMgmt->uLengthOfRepEIDs < (WLAN_A3FR_MAXLEN - sizeof(MEASEURE_REP) - sizeof(WLAN_80211HDR_A3) - 3))
-        ) {
-        pMgmt->pCurrMeasureEIDRep->byElementID = WLAN_EID_MEASURE_REP;
-        pMgmt->pCurrMeasureEIDRep->len = 3;
-        pMgmt->pCurrMeasureEIDRep->byToken = ((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->byToken;
-        pMgmt->pCurrMeasureEIDRep->byMode = byReportMode;
-        pMgmt->pCurrMeasureEIDRep->byType = ((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->byType;
-        switch (pMgmt->pCurrMeasureEIDRep->byType) {
-            case MEASURE_TYPE_BASIC :
-                pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_BASIC);
-                memcpy(   &(pMgmt->pCurrMeasureEIDRep->sRep.sBasic),
-                            &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
-                            sizeof(MEASEURE_REQ));
-                pMgmt->pCurrMeasureEIDRep->sRep.sBasic.byMap = byBasicMap;
-                break;
-            case MEASURE_TYPE_CCA :
-                pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_CCA);
-                memcpy(   &(pMgmt->pCurrMeasureEIDRep->sRep.sCCA),
-                            &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
-                            sizeof(MEASEURE_REQ));
-                pMgmt->pCurrMeasureEIDRep->sRep.sCCA.byCCABusyFraction = byCCAFraction;
-                break;
-            case MEASURE_TYPE_RPI :
-                pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_RPI);
-                memcpy(   &(pMgmt->pCurrMeasureEIDRep->sRep.sRPI),
-                            &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
-                            sizeof(MEASEURE_REQ));
-                memcpy(pMgmt->pCurrMeasureEIDRep->sRep.sRPI.abyRPIdensity, pbyRPIs, 8);
-                break;
-            default :
-                break;
-        }
-        pbyCurrentEID += (2 + pMgmt->pCurrMeasureEIDRep->len);
-        pMgmt->uLengthOfRepEIDs += (2 + pMgmt->pCurrMeasureEIDRep->len);
-        pMgmt->pCurrMeasureEIDRep = (PWLAN_IE_MEASURE_REP) pbyCurrentEID;
-    }
-    if (bEndOfReport == true) {
-        IEEE11hbMSRRepTx(pMgmt);
-    }
-    //spin_unlock_irq(&pDevice->lock);
-    return (true);
+       PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
+       unsigned char *pbyCurrentEID = (unsigned char *)(pMgmt->pCurrMeasureEIDRep);
+
+       //spin_lock_irq(&pDevice->lock);
+       if ((pvMeasureEID != NULL) &&
+           (pMgmt->uLengthOfRepEIDs < (WLAN_A3FR_MAXLEN - sizeof(MEASEURE_REP) - sizeof(WLAN_80211HDR_A3) - 3))
+) {
+               pMgmt->pCurrMeasureEIDRep->byElementID = WLAN_EID_MEASURE_REP;
+               pMgmt->pCurrMeasureEIDRep->len = 3;
+               pMgmt->pCurrMeasureEIDRep->byToken = ((PWLAN_IE_MEASURE_REQ)pvMeasureEID)->byToken;
+               pMgmt->pCurrMeasureEIDRep->byMode = byReportMode;
+               pMgmt->pCurrMeasureEIDRep->byType = ((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->byType;
+               switch (pMgmt->pCurrMeasureEIDRep->byType) {
+               case MEASURE_TYPE_BASIC:
+                       pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_BASIC);
+                       memcpy(&(pMgmt->pCurrMeasureEIDRep->sRep.sBasic),
+                              &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
+                              sizeof(MEASEURE_REQ));
+                       pMgmt->pCurrMeasureEIDRep->sRep.sBasic.byMap = byBasicMap;
+                       break;
+               case MEASURE_TYPE_CCA:
+                       pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_CCA);
+                       memcpy(&(pMgmt->pCurrMeasureEIDRep->sRep.sCCA),
+                              &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
+                              sizeof(MEASEURE_REQ));
+                       pMgmt->pCurrMeasureEIDRep->sRep.sCCA.byCCABusyFraction = byCCAFraction;
+                       break;
+               case MEASURE_TYPE_RPI:
+                       pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_RPI);
+                       memcpy(&(pMgmt->pCurrMeasureEIDRep->sRep.sRPI),
+                              &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
+                              sizeof(MEASEURE_REQ));
+                       memcpy(pMgmt->pCurrMeasureEIDRep->sRep.sRPI.abyRPIdensity, pbyRPIs, 8);
+                       break;
+               default:
+                       break;
+               }
+               pbyCurrentEID += (2 + pMgmt->pCurrMeasureEIDRep->len);
+               pMgmt->uLengthOfRepEIDs += (2 + pMgmt->pCurrMeasureEIDRep->len);
+               pMgmt->pCurrMeasureEIDRep = (PWLAN_IE_MEASURE_REP) pbyCurrentEID;
+       }
+       if (bEndOfReport == true) {
+               IEEE11hbMSRRepTx(pMgmt);
+       }
+       //spin_unlock_irq(&pDevice->lock);
+       return (true);
 }
 
 
 bool
 VNTWIFIbChannelSwitch(
-    void *pMgmtObject,
-    unsigned char byNewChannel
-    )
+       void *pMgmtObject,
+       unsigned char byNewChannel
+)
 {
-    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
+       PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
 
-    //spin_lock_irq(&pDevice->lock);
-    pMgmt->uCurrChannel = byNewChannel;
-    pMgmt->bSwitchChannel = false;
-    //spin_unlock_irq(&pDevice->lock);
-    return true;
+       //spin_lock_irq(&pDevice->lock);
+       pMgmt->uCurrChannel = byNewChannel;
+       pMgmt->bSwitchChannel = false;
+       //spin_unlock_irq(&pDevice->lock);
+       return true;
 }
 
 /*
-bool
-VNTWIFIbRadarPresent(
-    void *pMgmtObject,
-    unsigned char byChannel
-    )
-{
-    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
-    if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
-        (byChannel == (unsigned char) pMgmt->uCurrChannel) &&
-        (pMgmt->bSwitchChannel != true) &&
-        (pMgmt->b11hEnable == true)) {
-        if (!compare_ether_addr(pMgmt->abyIBSSDFSOwner, CARDpGetCurrentAddress(pMgmt->pAdapter))) {
-            pMgmt->byNewChannel = CARDbyAutoChannelSelect(pMgmt->pAdapter,(unsigned char) pMgmt->uCurrChannel);
-            pMgmt->bSwitchChannel = true;
-        }
-        BEACONbSendBeacon(pMgmt);
-        CARDbChannelSwitch(pMgmt->pAdapter, 0, pMgmt->byNewChannel, 10);
-    }
-    return true;
-}
+  bool
+  VNTWIFIbRadarPresent(
+  void *pMgmtObject,
+  unsigned char byChannel
+)
+  {
+  PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
+  if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
+  (byChannel == (unsigned char) pMgmt->uCurrChannel) &&
+  (pMgmt->bSwitchChannel != true) &&
+  (pMgmt->b11hEnable == true)) {
+  if (!compare_ether_addr(pMgmt->abyIBSSDFSOwner, CARDpGetCurrentAddress(pMgmt->pAdapter))) {
+  pMgmt->byNewChannel = CARDbyAutoChannelSelect(pMgmt->pAdapter,(unsigned char) pMgmt->uCurrChannel);
+  pMgmt->bSwitchChannel = true;
+  }
+  BEACONbSendBeacon(pMgmt);
+  CARDbChannelSwitch(pMgmt->pAdapter, 0, pMgmt->byNewChannel, 10);
+  }
+  return true;
+  }
 */
 
index f4327ab..49a0a02 100644 (file)
 // Pre-configured Authenticaiton Mode (from XP)
 typedef enum tagWMAC_AUTHENTICATION_MODE {
 
-    WMAC_AUTH_OPEN,
-    WMAC_AUTH_SHAREKEY,
-    WMAC_AUTH_AUTO,
-    WMAC_AUTH_WPA,
-    WMAC_AUTH_WPAPSK,
-    WMAC_AUTH_WPANONE,
-    WMAC_AUTH_WPA2,
-    WMAC_AUTH_WPA2PSK,
-    WMAC_AUTH_MAX       // Not a real mode, defined as upper bound
+       WMAC_AUTH_OPEN,
+       WMAC_AUTH_SHAREKEY,
+       WMAC_AUTH_AUTO,
+       WMAC_AUTH_WPA,
+       WMAC_AUTH_WPAPSK,
+       WMAC_AUTH_WPANONE,
+       WMAC_AUTH_WPA2,
+       WMAC_AUTH_WPA2PSK,
+       WMAC_AUTH_MAX       // Not a real mode, defined as upper bound
 
 } WMAC_AUTHENTICATION_MODE, *PWMAC_AUTHENTICATION_MODE;
 
 typedef enum tagWMAC_ENCRYPTION_MODE {
 
-    WMAC_ENCRYPTION_WEPEnabled,
-    WMAC_ENCRYPTION_WEPDisabled,
-    WMAC_ENCRYPTION_WEPKeyAbsent,
-    WMAC_ENCRYPTION_WEPNotSupported,
-    WMAC_ENCRYPTION_TKIPEnabled,
-    WMAC_ENCRYPTION_TKIPKeyAbsent,
-    WMAC_ENCRYPTION_AESEnabled,
-    WMAC_ENCRYPTION_AESKeyAbsent
+       WMAC_ENCRYPTION_WEPEnabled,
+       WMAC_ENCRYPTION_WEPDisabled,
+       WMAC_ENCRYPTION_WEPKeyAbsent,
+       WMAC_ENCRYPTION_WEPNotSupported,
+       WMAC_ENCRYPTION_TKIPEnabled,
+       WMAC_ENCRYPTION_TKIPKeyAbsent,
+       WMAC_ENCRYPTION_AESEnabled,
+       WMAC_ENCRYPTION_AESKeyAbsent
 
 } WMAC_ENCRYPTION_MODE, *PWMAC_ENCRYPTION_MODE;
 
@@ -94,10 +94,10 @@ typedef enum tagWMAC_ENCRYPTION_MODE {
 
 typedef enum tagWMAC_CONFIG_MODE {
 
-    WMAC_CONFIG_ESS_STA = 0,
-    WMAC_CONFIG_IBSS_STA,
-    WMAC_CONFIG_AUTO,
-    WMAC_CONFIG_AP
+       WMAC_CONFIG_ESS_STA = 0,
+       WMAC_CONFIG_IBSS_STA,
+       WMAC_CONFIG_AUTO,
+       WMAC_CONFIG_AP
 
 } WMAC_CONFIG_MODE, *PWMAC_CONFIG_MODE;
 
@@ -105,29 +105,29 @@ typedef enum tagWMAC_CONFIG_MODE {
 
 typedef enum tagWMAC_POWER_MODE {
 
-    WMAC_POWER_CAM,
-    WMAC_POWER_FAST,
-    WMAC_POWER_MAX
+       WMAC_POWER_CAM,
+       WMAC_POWER_FAST,
+       WMAC_POWER_MAX
 
 } WMAC_POWER_MODE, *PWMAC_POWER_MODE;
 
 #define VNTWIFIbIsShortSlotTime(wCapInfo)               \
-        WLAN_GET_CAP_INFO_SHORTSLOTTIME(wCapInfo)       \
+       WLAN_GET_CAP_INFO_SHORTSLOTTIME(wCapInfo)       \
 
 #define VNTWIFIbIsProtectMode(byERP)                    \
-        ((byERP & WLAN_EID_ERP_USE_PROTECTION) != 0)    \
+       ((byERP & WLAN_EID_ERP_USE_PROTECTION) != 0)    \
 
 #define VNTWIFIbIsBarkerMode(byERP)                     \
-        ((byERP & WLAN_EID_ERP_BARKER_MODE) != 0)       \
+       ((byERP & WLAN_EID_ERP_BARKER_MODE) != 0)       \
 
 #define VNTWIFIbIsShortPreamble(wCapInfo)               \
-        WLAN_GET_CAP_INFO_SHORTPREAMBLE(wCapInfo)       \
+       WLAN_GET_CAP_INFO_SHORTPREAMBLE(wCapInfo)       \
 
-#define VNTWIFIbIsEncryption(wCapInfo)                  \
-        WLAN_GET_CAP_INFO_PRIVACY(wCapInfo)             \
+#define VNTWIFIbIsEncryption(wCapInfo)         \
+       WLAN_GET_CAP_INFO_PRIVACY(wCapInfo)     \
 
-#define VNTWIFIbIsESS(wCapInfo)                         \
-        WLAN_GET_CAP_INFO_ESS(wCapInfo)                 \
+#define VNTWIFIbIsESS(wCapInfo)                        \
+       WLAN_GET_CAP_INFO_ESS(wCapInfo)         \
 
 
 /*---------------------  Export Classes  ----------------------------*/
@@ -141,167 +141,167 @@ typedef enum tagWMAC_POWER_MODE {
 /*---------------------  Export Functions  --------------------------*/
 
 void
-VNTWIFIvSetIBSSParameter (
-    void *pMgmtHandle,
-    unsigned short wBeaconPeriod,
-    unsigned short wATIMWindow,
-    unsigned int uChannel
-    );
+VNTWIFIvSetIBSSParameter(
+       void *pMgmtHandle,
+       unsigned short wBeaconPeriod,
+       unsigned short wATIMWindow,
+       unsigned int uChannel
+);
 
 void
-VNTWIFIvSetOPMode (
-    void *pMgmtHandle,
-    WMAC_CONFIG_MODE eOPMode
-    );
+VNTWIFIvSetOPMode(
+       void *pMgmtHandle,
+       WMAC_CONFIG_MODE eOPMode
+);
 
 PWLAN_IE_SSID
 VNTWIFIpGetCurrentSSID(
-    void *pMgmtHandle
-    );
+       void *pMgmtHandle
+);
 
 unsigned int
 VNTWIFIpGetCurrentChannel(
-    void *pMgmtHandle
-    );
+       void *pMgmtHandle
+);
 
 unsigned short
-VNTWIFIwGetAssocID (
-    void *pMgmtHandle
-    );
+VNTWIFIwGetAssocID(
+       void *pMgmtHandle
+);
 
 unsigned char
-VNTWIFIbyGetMaxSupportRate (
-    PWLAN_IE_SUPP_RATES pSupportRateIEs,
-    PWLAN_IE_SUPP_RATES pExtSupportRateIEs
-    );
+VNTWIFIbyGetMaxSupportRate(
+       PWLAN_IE_SUPP_RATES pSupportRateIEs,
+       PWLAN_IE_SUPP_RATES pExtSupportRateIEs
+);
 
 unsigned char
-VNTWIFIbyGetACKTxRate (
-    unsigned char byRxDataRate,
-    PWLAN_IE_SUPP_RATES pSupportRateIEs,
-    PWLAN_IE_SUPP_RATES pExtSupportRateIEs
-    );
+VNTWIFIbyGetACKTxRate(
+       unsigned char byRxDataRate,
+       PWLAN_IE_SUPP_RATES pSupportRateIEs,
+       PWLAN_IE_SUPP_RATES pExtSupportRateIEs
+);
 
 void
-VNTWIFIvSetAuthenticationMode (
-    void *pMgmtHandle,
-    WMAC_AUTHENTICATION_MODE eAuthMode
-    );
+VNTWIFIvSetAuthenticationMode(
+       void *pMgmtHandle,
+       WMAC_AUTHENTICATION_MODE eAuthMode
+);
 
 void
-VNTWIFIvSetEncryptionMode (
-    void *pMgmtHandle,
-    WMAC_ENCRYPTION_MODE eEncryptionMode
-    );
+VNTWIFIvSetEncryptionMode(
+       void *pMgmtHandle,
+       WMAC_ENCRYPTION_MODE eEncryptionMode
+);
 
 
 bool
 VNTWIFIbConfigPhyMode(
-    void *pMgmtHandle,
-    CARD_PHY_TYPE ePhyType
-    );
+       void *pMgmtHandle,
+       CARD_PHY_TYPE ePhyType
+);
 
 void
 VNTWIFIbGetConfigPhyMode(
-    void *pMgmtHandle,
-    void *pePhyType
-    );
+       void *pMgmtHandle,
+       void *pePhyType
+);
 
 void
 VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount,
-               void **pvFirstBSS);
+                    void **pvFirstBSS);
 
 void
-VNTWIFIvGetNextBSS (
-    void *pMgmtHandle,
-    void *pvCurrentBSS,
-    void **pvNextBSS
-    );
+VNTWIFIvGetNextBSS(
+       void *pMgmtHandle,
+       void *pvCurrentBSS,
+       void **pvNextBSS
+);
 
 
 
 void
 VNTWIFIvUpdateNodeTxCounter(
-    void *pMgmtHandle,
-    unsigned char *pbyDestAddress,
-    bool bTxOk,
-    unsigned short wRate,
-    unsigned char *pbyTxFailCount
-    );
+       void *pMgmtHandle,
+       unsigned char *pbyDestAddress,
+       bool bTxOk,
+       unsigned short wRate,
+       unsigned char *pbyTxFailCount
+);
 
 
 void
 VNTWIFIvGetTxRate(
-    void *pMgmtHandle,
-    unsigned char *pbyDestAddress,
-    unsigned short *pwTxDataRate,
-    unsigned char *pbyACKRate,
-    unsigned char *pbyCCKBasicRate,
-    unsigned char *pbyOFDMBasicRate
-    );
+       void *pMgmtHandle,
+       unsigned char *pbyDestAddress,
+       unsigned short *pwTxDataRate,
+       unsigned char *pbyACKRate,
+       unsigned char *pbyCCKBasicRate,
+       unsigned char *pbyOFDMBasicRate
+);
 /*
-bool
-VNTWIFIbInit(
-    void *pAdapterHandler,
-    void **pMgmtHandler
-    );
+  bool
+  VNTWIFIbInit(
+  void *pAdapterHandler,
+  void **pMgmtHandler
+);
 */
 
 unsigned char
 VNTWIFIbyGetKeyCypher(
-    void *pMgmtHandle,
-    bool bGroupKey
-    );
+       void *pMgmtHandle,
+       bool bGroupKey
+);
 
 
 
 
 bool
-VNTWIFIbSetPMKIDCache (
-    void *pMgmtObject,
-    unsigned long ulCount,
-    void *pPMKIDInfo
-    );
+VNTWIFIbSetPMKIDCache(
+       void *pMgmtObject,
+       unsigned long ulCount,
+       void *pPMKIDInfo
+);
 
 bool
-VNTWIFIbCommandRunning (
-    void *pMgmtObject
-    );
+VNTWIFIbCommandRunning(
+       void *pMgmtObject
+);
 
 unsigned short
 VNTWIFIwGetMaxSupportRate(
-    void *pMgmtObject
-    );
+       void *pMgmtObject
+);
 
 // for 802.11h
 void
-VNTWIFIvSet11h (
-    void *pMgmtObject,
-    bool b11hEnable
-    );
+VNTWIFIvSet11h(
+       void *pMgmtObject,
+       bool b11hEnable
+);
 
 bool
 VNTWIFIbMeasureReport(
-    void *pMgmtObject,
-    bool bEndOfReport,
-    void *pvMeasureEID,
-    unsigned char byReportMode,
-    unsigned char byBasicMap,
-    unsigned char byCCAFraction,
-    unsigned char *pbyRPIs
-    );
+       void *pMgmtObject,
+       bool bEndOfReport,
+       void *pvMeasureEID,
+       unsigned char byReportMode,
+       unsigned char byBasicMap,
+       unsigned char byCCAFraction,
+       unsigned char *pbyRPIs
+);
 
 bool
 VNTWIFIbChannelSwitch(
-    void *pMgmtObject,
-    unsigned char byNewChannel
-    );
+       void *pMgmtObject,
+       unsigned char byNewChannel
+);
 /*
-bool
-VNTWIFIbRadarPresent(
-    void *pMgmtObject,
-    unsigned char byChannel
-    );
+  bool
+  VNTWIFIbRadarPresent(
+  void *pMgmtObject,
+  unsigned char byChannel
+);
 */
 
 #endif //__VNTWIFI_H__