Skip to content

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

staging:vt6655:vntwifi: 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 031d3996
Show whitespace changes
Inline Side-by-side
Showing with 582 additions and 582 deletions
drivers/staging/vt6655/vntwifi.c
View file @ d9d644ed
...@@ -66,12 +66,12 @@ ...@@ -66,12 +66,12 @@
* *
* Return Value: none * Return Value: none
* *
-*/ -*/
void void
VNTWIFIvSetOPMode ( VNTWIFIvSetOPMode(
void *pMgmtHandle, void *pMgmtHandle,
WMAC_CONFIG_MODE eOPMode WMAC_CONFIG_MODE eOPMode
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
...@@ -95,14 +95,14 @@ VNTWIFIvSetOPMode ( ...@@ -95,14 +95,14 @@ VNTWIFIvSetOPMode (
* *
* Return Value: none * Return Value: none
* *
-*/ -*/
void void
VNTWIFIvSetIBSSParameter ( VNTWIFIvSetIBSSParameter(
void *pMgmtHandle, void *pMgmtHandle,
unsigned short wBeaconPeriod, unsigned short wBeaconPeriod,
unsigned short wATIMWindow, unsigned short wATIMWindow,
unsigned int uChannel unsigned int uChannel
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
...@@ -124,11 +124,11 @@ VNTWIFIvSetIBSSParameter ( ...@@ -124,11 +124,11 @@ VNTWIFIvSetIBSSParameter (
* *
* Return Value: current SSID pointer. * Return Value: current SSID pointer.
* *
-*/ -*/
PWLAN_IE_SSID PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID ( VNTWIFIpGetCurrentSSID(
void *pMgmtHandle void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
return((PWLAN_IE_SSID) pMgmt->abyCurrSSID); return((PWLAN_IE_SSID) pMgmt->abyCurrSSID);
...@@ -147,11 +147,11 @@ VNTWIFIpGetCurrentSSID ( ...@@ -147,11 +147,11 @@ VNTWIFIpGetCurrentSSID (
* *
* Return Value: current Channel. * Return Value: current Channel.
* *
-*/ -*/
unsigned int unsigned int
VNTWIFIpGetCurrentChannel ( VNTWIFIpGetCurrentChannel(
void *pMgmtHandle void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
if (pMgmtHandle != NULL) { if (pMgmtHandle != NULL) {
...@@ -173,11 +173,11 @@ VNTWIFIpGetCurrentChannel ( ...@@ -173,11 +173,11 @@ VNTWIFIpGetCurrentChannel (
* *
* Return Value: current Assoc ID * Return Value: current Assoc ID
* *
-*/ -*/
unsigned short unsigned short
VNTWIFIwGetAssocID ( VNTWIFIwGetAssocID(
void *pMgmtHandle void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
return(pMgmt->wCurrAID); return(pMgmt->wCurrAID);
...@@ -199,12 +199,12 @@ VNTWIFIwGetAssocID ( ...@@ -199,12 +199,12 @@ VNTWIFIwGetAssocID (
* *
* Return Value: max support rate * Return Value: max support rate
* *
-*/ -*/
unsigned char unsigned char
VNTWIFIbyGetMaxSupportRate ( VNTWIFIbyGetMaxSupportRate(
PWLAN_IE_SUPP_RATES pSupportRateIEs, PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs PWLAN_IE_SUPP_RATES pExtSupportRateIEs
) )
{ {
unsigned char byMaxSupportRate = RATE_1M; unsigned char byMaxSupportRate = RATE_1M;
unsigned char bySupportRate = RATE_1M; unsigned char bySupportRate = RATE_1M;
...@@ -245,13 +245,13 @@ VNTWIFIbyGetMaxSupportRate ( ...@@ -245,13 +245,13 @@ VNTWIFIbyGetMaxSupportRate (
* *
* Return Value: max support rate * Return Value: max support rate
* *
-*/ -*/
unsigned char unsigned char
VNTWIFIbyGetACKTxRate ( VNTWIFIbyGetACKTxRate(
unsigned char byRxDataRate, unsigned char byRxDataRate,
PWLAN_IE_SUPP_RATES pSupportRateIEs, PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs PWLAN_IE_SUPP_RATES pExtSupportRateIEs
) )
{ {
unsigned char byMaxAckRate; unsigned char byMaxAckRate;
unsigned char byBasicRate; unsigned char byBasicRate;
...@@ -303,12 +303,12 @@ VNTWIFIbyGetACKTxRate ( ...@@ -303,12 +303,12 @@ VNTWIFIbyGetACKTxRate (
* *
* Return Value: none * Return Value: none
* *
-*/ -*/
void void
VNTWIFIvSetAuthenticationMode ( VNTWIFIvSetAuthenticationMode(
void *pMgmtHandle, void *pMgmtHandle,
WMAC_AUTHENTICATION_MODE eAuthMode WMAC_AUTHENTICATION_MODE eAuthMode
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
...@@ -335,19 +335,19 @@ VNTWIFIvSetAuthenticationMode ( ...@@ -335,19 +335,19 @@ VNTWIFIvSetAuthenticationMode (
* *
* Return Value: none * Return Value: none
* *
-*/ -*/
void void
VNTWIFIvSetEncryptionMode ( VNTWIFIvSetEncryptionMode(
void *pMgmtHandle, void *pMgmtHandle,
WMAC_ENCRYPTION_MODE eEncryptionMode WMAC_ENCRYPTION_MODE eEncryptionMode
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
pMgmt->eEncryptionMode = eEncryptionMode; pMgmt->eEncryptionMode = eEncryptionMode;
if ((eEncryptionMode == WMAC_ENCRYPTION_WEPEnabled) || if ((eEncryptionMode == WMAC_ENCRYPTION_WEPEnabled) ||
(eEncryptionMode == WMAC_ENCRYPTION_TKIPEnabled) || (eEncryptionMode == WMAC_ENCRYPTION_TKIPEnabled) ||
(eEncryptionMode == WMAC_ENCRYPTION_AESEnabled) ) { (eEncryptionMode == WMAC_ENCRYPTION_AESEnabled)) {
pMgmt->bPrivacyInvoked = true; pMgmt->bPrivacyInvoked = true;
} else { } else {
pMgmt->bPrivacyInvoked = false; pMgmt->bPrivacyInvoked = false;
...@@ -357,16 +357,16 @@ VNTWIFIvSetEncryptionMode ( ...@@ -357,16 +357,16 @@ VNTWIFIvSetEncryptionMode (
bool bool
VNTWIFIbConfigPhyMode ( VNTWIFIbConfigPhyMode(
void *pMgmtHandle, void *pMgmtHandle,
CARD_PHY_TYPE ePhyType CARD_PHY_TYPE ePhyType
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
if ((ePhyType != PHY_TYPE_AUTO) && if ((ePhyType != PHY_TYPE_AUTO) &&
(ePhyType != pMgmt->eCurrentPHYMode)) { (ePhyType != pMgmt->eCurrentPHYMode)) {
if (CARDbSetPhyParameter(pMgmt->pAdapter, ePhyType, 0, 0, NULL, NULL)==true) { if (CARDbSetPhyParameter(pMgmt->pAdapter, ePhyType, 0, 0, NULL, NULL) == true) {
pMgmt->eCurrentPHYMode = ePhyType; pMgmt->eCurrentPHYMode = ePhyType;
} else { } else {
return(false); return(false);
...@@ -378,10 +378,10 @@ VNTWIFIbConfigPhyMode ( ...@@ -378,10 +378,10 @@ VNTWIFIbConfigPhyMode (
void void
VNTWIFIbGetConfigPhyMode ( VNTWIFIbGetConfigPhyMode(
void *pMgmtHandle, void *pMgmtHandle,
void *pePhyType void *pePhyType
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
...@@ -403,7 +403,7 @@ VNTWIFIbGetConfigPhyMode ( ...@@ -403,7 +403,7 @@ VNTWIFIbGetConfigPhyMode (
* *
* Return Value: None. * Return Value: None.
* *
-*/ -*/
/*+ /*+
...@@ -420,7 +420,7 @@ VNTWIFIbGetConfigPhyMode ( ...@@ -420,7 +420,7 @@ VNTWIFIbGetConfigPhyMode (
* *
* Return Value: None. * Return Value: None.
* *
-*/ -*/
void void
VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirstBSS) VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirstBSS)
...@@ -449,11 +449,11 @@ VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirst ...@@ -449,11 +449,11 @@ VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirst
void void
VNTWIFIvGetNextBSS ( VNTWIFIvGetNextBSS(
void *pMgmtHandle, void *pMgmtHandle,
void *pvCurrentBSS, void *pvCurrentBSS,
void **pvNextBSS void **pvNextBSS
) )
{ {
PKnownBSS pBSS = (PKnownBSS) pvCurrentBSS; PKnownBSS pBSS = (PKnownBSS) pvCurrentBSS;
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
...@@ -487,7 +487,7 @@ VNTWIFIvGetNextBSS ( ...@@ -487,7 +487,7 @@ VNTWIFIvGetNextBSS (
* *
* Return Value: none * Return Value: none
* *
-*/ -*/
void void
VNTWIFIvUpdateNodeTxCounter( VNTWIFIvUpdateNodeTxCounter(
void *pMgmtHandle, void *pMgmtHandle,
...@@ -495,7 +495,7 @@ VNTWIFIvUpdateNodeTxCounter( ...@@ -495,7 +495,7 @@ VNTWIFIvUpdateNodeTxCounter(
bool bTxOk, bool bTxOk,
unsigned short wRate, unsigned short wRate,
unsigned char *pbyTxFailCount unsigned char *pbyTxFailCount
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
unsigned int uNodeIndex = 0; unsigned int uNodeIndex = 0;
...@@ -516,7 +516,7 @@ VNTWIFIvUpdateNodeTxCounter( ...@@ -516,7 +516,7 @@ VNTWIFIvUpdateNodeTxCounter(
pMgmt->sNodeDBTable[uNodeIndex].uTxFailures++; pMgmt->sNodeDBTable[uNodeIndex].uTxFailures++;
} }
pMgmt->sNodeDBTable[uNodeIndex].uTxRetry += pbyTxFailCount[MAX_RATE]; pMgmt->sNodeDBTable[uNodeIndex].uTxRetry += pbyTxFailCount[MAX_RATE];
for(ii=0;ii<MAX_RATE;ii++) { for (ii = 0; ii < MAX_RATE; ii++) {
pMgmt->sNodeDBTable[uNodeIndex].uTxFail[ii] += pbyTxFailCount[ii]; pMgmt->sNodeDBTable[uNodeIndex].uTxFail[ii] += pbyTxFailCount[ii];
} }
return; return;
...@@ -531,7 +531,7 @@ VNTWIFIvGetTxRate( ...@@ -531,7 +531,7 @@ VNTWIFIvGetTxRate(
unsigned char *pbyACKRate, unsigned char *pbyACKRate,
unsigned char *pbyCCKBasicRate, unsigned char *pbyCCKBasicRate,
unsigned char *pbyOFDMBasicRate unsigned char *pbyOFDMBasicRate
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
unsigned int uNodeIndex = 0; unsigned int uNodeIndex = 0;
...@@ -546,7 +546,7 @@ VNTWIFIvGetTxRate( ...@@ -546,7 +546,7 @@ VNTWIFIvGetTxRate(
if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) || if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
(pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) { (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
// Adhoc Tx rate decided from node DB // Adhoc Tx rate decided from node DB
if(BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex)) { if (BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex)) {
wTxDataRate = (pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate); wTxDataRate = (pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate);
pSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrSuppRates); pSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrSuppRates);
pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrExtSuppRates); pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) (pMgmt->sNodeDBTable[uNodeIndex].abyCurrExtSuppRates);
...@@ -571,21 +571,21 @@ VNTWIFIvGetTxRate( ...@@ -571,21 +571,21 @@ VNTWIFIvGetTxRate(
pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates; pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates;
pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates; pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates;
} }
byACKRate = VNTWIFIbyGetACKTxRate( (unsigned char) wTxDataRate, byACKRate = VNTWIFIbyGetACKTxRate((unsigned char) wTxDataRate,
pSupportRateIEs, pSupportRateIEs,
pExtSupportRateIEs pExtSupportRateIEs
); );
if (byACKRate > (unsigned char) wTxDataRate) { if (byACKRate > (unsigned char) wTxDataRate) {
byACKRate = (unsigned char) wTxDataRate; byACKRate = (unsigned char) wTxDataRate;
} }
byCCKBasicRate = VNTWIFIbyGetACKTxRate( RATE_11M, byCCKBasicRate = VNTWIFIbyGetACKTxRate(RATE_11M,
pSupportRateIEs, pSupportRateIEs,
pExtSupportRateIEs pExtSupportRateIEs
); );
byOFDMBasicRate = VNTWIFIbyGetACKTxRate(RATE_54M, byOFDMBasicRate = VNTWIFIbyGetACKTxRate(RATE_54M,
pSupportRateIEs, pSupportRateIEs,
pExtSupportRateIEs pExtSupportRateIEs
); );
*pwTxDataRate = wTxDataRate; *pwTxDataRate = wTxDataRate;
*pbyACKRate = byACKRate; *pbyACKRate = byACKRate;
*pbyCCKBasicRate = byCCKBasicRate; *pbyCCKBasicRate = byCCKBasicRate;
...@@ -597,7 +597,7 @@ unsigned char ...@@ -597,7 +597,7 @@ unsigned char
VNTWIFIbyGetKeyCypher( VNTWIFIbyGetKeyCypher(
void *pMgmtHandle, void *pMgmtHandle,
bool bGroupKey bool bGroupKey
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
...@@ -610,12 +610,12 @@ VNTWIFIbyGetKeyCypher( ...@@ -610,12 +610,12 @@ VNTWIFIbyGetKeyCypher(
/* /*
bool bool
VNTWIFIbInit( VNTWIFIbInit(
void *pAdapterHandler, void *pAdapterHandler,
void **pMgmtHandler void **pMgmtHandler
) )
{ {
PSMgmtObject pMgmt = NULL; PSMgmtObject pMgmt = NULL;
unsigned int ii; unsigned int ii;
...@@ -631,7 +631,7 @@ VNTWIFIbInit( ...@@ -631,7 +631,7 @@ VNTWIFIbInit(
pMgmt->pAdapter = (void *) pAdapterHandler; pMgmt->pAdapter = (void *) pAdapterHandler;
// should initial MAC address abyMACAddr // should initial MAC address abyMACAddr
for(ii=0;ii<WLAN_BSSID_LEN;ii++) { for (ii=0; ii<WLAN_BSSID_LEN; ii++) {
pMgmt->abyDesireBSSID[ii] = 0xFF; pMgmt->abyDesireBSSID[ii] = 0xFF;
} }
pMgmt->pbyPSPacketPool = &pMgmt->byPSPacketPool[0]; pMgmt->pbyPSPacketPool = &pMgmt->byPSPacketPool[0];
...@@ -649,17 +649,17 @@ VNTWIFIbInit( ...@@ -649,17 +649,17 @@ VNTWIFIbInit(
*pMgmtHandler = pMgmt; *pMgmtHandler = pMgmt;
return true; return true;
} }
*/ */
bool bool
VNTWIFIbSetPMKIDCache ( VNTWIFIbSetPMKIDCache(
void *pMgmtObject, void *pMgmtObject,
unsigned long ulCount, unsigned long ulCount,
void *pPMKIDInfo void *pPMKIDInfo
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
...@@ -676,12 +676,12 @@ VNTWIFIbSetPMKIDCache ( ...@@ -676,12 +676,12 @@ VNTWIFIbSetPMKIDCache (
unsigned short unsigned short
VNTWIFIwGetMaxSupportRate( VNTWIFIwGetMaxSupportRate(
void *pMgmtObject void *pMgmtObject
) )
{ {
unsigned short wRate = RATE_54M; unsigned short wRate = RATE_54M;
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
for(wRate = RATE_54M; wRate > RATE_1M; wRate--) { for (wRate = RATE_54M; wRate > RATE_1M; wRate--) {
if (pMgmt->sNodeDBTable[0].wSuppRate & (1<<wRate)) { if (pMgmt->sNodeDBTable[0].wSuppRate & (1<<wRate)) {
return (wRate); return (wRate);
} }
...@@ -695,10 +695,10 @@ VNTWIFIwGetMaxSupportRate( ...@@ -695,10 +695,10 @@ VNTWIFIwGetMaxSupportRate(
void void
VNTWIFIvSet11h ( VNTWIFIvSet11h(
void *pMgmtObject, void *pMgmtObject,
bool b11hEnable bool b11hEnable
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
...@@ -714,43 +714,43 @@ VNTWIFIbMeasureReport( ...@@ -714,43 +714,43 @@ VNTWIFIbMeasureReport(
unsigned char byBasicMap, unsigned char byBasicMap,
unsigned char byCCAFraction, unsigned char byCCAFraction,
unsigned char *pbyRPIs unsigned char *pbyRPIs
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
unsigned char *pbyCurrentEID = (unsigned char *) (pMgmt->pCurrMeasureEIDRep); unsigned char *pbyCurrentEID = (unsigned char *)(pMgmt->pCurrMeasureEIDRep);
//spin_lock_irq(&pDevice->lock); //spin_lock_irq(&pDevice->lock);
if ((pvMeasureEID != NULL) && if ((pvMeasureEID != NULL) &&
(pMgmt->uLengthOfRepEIDs < (WLAN_A3FR_MAXLEN - sizeof(MEASEURE_REP) - sizeof(WLAN_80211HDR_A3) - 3)) (pMgmt->uLengthOfRepEIDs < (WLAN_A3FR_MAXLEN - sizeof(MEASEURE_REP) - sizeof(WLAN_80211HDR_A3) - 3))
) { ) {
pMgmt->pCurrMeasureEIDRep->byElementID = WLAN_EID_MEASURE_REP; pMgmt->pCurrMeasureEIDRep->byElementID = WLAN_EID_MEASURE_REP;
pMgmt->pCurrMeasureEIDRep->len = 3; pMgmt->pCurrMeasureEIDRep->len = 3;
pMgmt->pCurrMeasureEIDRep->byToken = ((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->byToken; pMgmt->pCurrMeasureEIDRep->byToken = ((PWLAN_IE_MEASURE_REQ)pvMeasureEID)->byToken;
pMgmt->pCurrMeasureEIDRep->byMode = byReportMode; pMgmt->pCurrMeasureEIDRep->byMode = byReportMode;
pMgmt->pCurrMeasureEIDRep->byType = ((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->byType; pMgmt->pCurrMeasureEIDRep->byType = ((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->byType;
switch (pMgmt->pCurrMeasureEIDRep->byType) { switch (pMgmt->pCurrMeasureEIDRep->byType) {
case MEASURE_TYPE_BASIC : case MEASURE_TYPE_BASIC:
pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_BASIC); pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_BASIC);
memcpy( &(pMgmt->pCurrMeasureEIDRep->sRep.sBasic), memcpy(&(pMgmt->pCurrMeasureEIDRep->sRep.sBasic),
&(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq), &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
sizeof(MEASEURE_REQ)); sizeof(MEASEURE_REQ));
pMgmt->pCurrMeasureEIDRep->sRep.sBasic.byMap = byBasicMap; pMgmt->pCurrMeasureEIDRep->sRep.sBasic.byMap = byBasicMap;
break; break;
case MEASURE_TYPE_CCA : case MEASURE_TYPE_CCA:
pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_CCA); pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_CCA);
memcpy( &(pMgmt->pCurrMeasureEIDRep->sRep.sCCA), memcpy(&(pMgmt->pCurrMeasureEIDRep->sRep.sCCA),
&(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq), &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
sizeof(MEASEURE_REQ)); sizeof(MEASEURE_REQ));
pMgmt->pCurrMeasureEIDRep->sRep.sCCA.byCCABusyFraction = byCCAFraction; pMgmt->pCurrMeasureEIDRep->sRep.sCCA.byCCABusyFraction = byCCAFraction;
break; break;
case MEASURE_TYPE_RPI : case MEASURE_TYPE_RPI:
pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_RPI); pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_RPI);
memcpy( &(pMgmt->pCurrMeasureEIDRep->sRep.sRPI), memcpy(&(pMgmt->pCurrMeasureEIDRep->sRep.sRPI),
&(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq), &(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
sizeof(MEASEURE_REQ)); sizeof(MEASEURE_REQ));
memcpy(pMgmt->pCurrMeasureEIDRep->sRep.sRPI.abyRPIdensity, pbyRPIs, 8); memcpy(pMgmt->pCurrMeasureEIDRep->sRep.sRPI.abyRPIdensity, pbyRPIs, 8);
break; break;
default : default:
break; break;
} }
pbyCurrentEID += (2 + pMgmt->pCurrMeasureEIDRep->len); pbyCurrentEID += (2 + pMgmt->pCurrMeasureEIDRep->len);
...@@ -769,7 +769,7 @@ bool ...@@ -769,7 +769,7 @@ bool
VNTWIFIbChannelSwitch( VNTWIFIbChannelSwitch(
void *pMgmtObject, void *pMgmtObject,
unsigned char byNewChannel unsigned char byNewChannel
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
...@@ -781,12 +781,12 @@ VNTWIFIbChannelSwitch( ...@@ -781,12 +781,12 @@ VNTWIFIbChannelSwitch(
} }
/* /*
bool bool
VNTWIFIbRadarPresent( VNTWIFIbRadarPresent(
void *pMgmtObject, void *pMgmtObject,
unsigned char byChannel unsigned char byChannel
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
(byChannel == (unsigned char) pMgmt->uCurrChannel) && (byChannel == (unsigned char) pMgmt->uCurrChannel) &&
...@@ -800,6 +800,6 @@ VNTWIFIbRadarPresent( ...@@ -800,6 +800,6 @@ VNTWIFIbRadarPresent(
CARDbChannelSwitch(pMgmt->pAdapter, 0, pMgmt->byNewChannel, 10); CARDbChannelSwitch(pMgmt->pAdapter, 0, pMgmt->byNewChannel, 10);
} }
return true; return true;
} }
*/ */
drivers/staging/vt6655/vntwifi.h
View file @ d9d644ed
...@@ -141,82 +141,82 @@ typedef enum tagWMAC_POWER_MODE { ...@@ -141,82 +141,82 @@ typedef enum tagWMAC_POWER_MODE {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
void void
VNTWIFIvSetIBSSParameter ( VNTWIFIvSetIBSSParameter(
void *pMgmtHandle, void *pMgmtHandle,
unsigned short wBeaconPeriod, unsigned short wBeaconPeriod,
unsigned short wATIMWindow, unsigned short wATIMWindow,
unsigned int uChannel unsigned int uChannel
); );
void void
VNTWIFIvSetOPMode ( VNTWIFIvSetOPMode(
void *pMgmtHandle, void *pMgmtHandle,
WMAC_CONFIG_MODE eOPMode WMAC_CONFIG_MODE eOPMode
); );
PWLAN_IE_SSID PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID( VNTWIFIpGetCurrentSSID(
void *pMgmtHandle void *pMgmtHandle
); );
unsigned int unsigned int
VNTWIFIpGetCurrentChannel( VNTWIFIpGetCurrentChannel(
void *pMgmtHandle void *pMgmtHandle
); );
unsigned short unsigned short
VNTWIFIwGetAssocID ( VNTWIFIwGetAssocID(
void *pMgmtHandle void *pMgmtHandle
); );
unsigned char unsigned char
VNTWIFIbyGetMaxSupportRate ( VNTWIFIbyGetMaxSupportRate(
PWLAN_IE_SUPP_RATES pSupportRateIEs, PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs PWLAN_IE_SUPP_RATES pExtSupportRateIEs
); );
unsigned char unsigned char
VNTWIFIbyGetACKTxRate ( VNTWIFIbyGetACKTxRate(
unsigned char byRxDataRate, unsigned char byRxDataRate,
PWLAN_IE_SUPP_RATES pSupportRateIEs, PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs PWLAN_IE_SUPP_RATES pExtSupportRateIEs
); );
void void
VNTWIFIvSetAuthenticationMode ( VNTWIFIvSetAuthenticationMode(
void *pMgmtHandle, void *pMgmtHandle,
WMAC_AUTHENTICATION_MODE eAuthMode WMAC_AUTHENTICATION_MODE eAuthMode
); );
void void
VNTWIFIvSetEncryptionMode ( VNTWIFIvSetEncryptionMode(
void *pMgmtHandle, void *pMgmtHandle,
WMAC_ENCRYPTION_MODE eEncryptionMode WMAC_ENCRYPTION_MODE eEncryptionMode
); );
bool bool
VNTWIFIbConfigPhyMode( VNTWIFIbConfigPhyMode(
void *pMgmtHandle, void *pMgmtHandle,
CARD_PHY_TYPE ePhyType CARD_PHY_TYPE ePhyType
); );
void void
VNTWIFIbGetConfigPhyMode( VNTWIFIbGetConfigPhyMode(
void *pMgmtHandle, void *pMgmtHandle,
void *pePhyType void *pePhyType
); );
void void
VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount,
void **pvFirstBSS); void **pvFirstBSS);
void void
VNTWIFIvGetNextBSS ( VNTWIFIvGetNextBSS(
void *pMgmtHandle, void *pMgmtHandle,
void *pvCurrentBSS, void *pvCurrentBSS,
void **pvNextBSS void **pvNextBSS
); );
...@@ -227,7 +227,7 @@ VNTWIFIvUpdateNodeTxCounter( ...@@ -227,7 +227,7 @@ VNTWIFIvUpdateNodeTxCounter(
bool bTxOk, bool bTxOk,
unsigned short wRate, unsigned short wRate,
unsigned char *pbyTxFailCount unsigned char *pbyTxFailCount
); );
void void
...@@ -238,47 +238,47 @@ VNTWIFIvGetTxRate( ...@@ -238,47 +238,47 @@ VNTWIFIvGetTxRate(
unsigned char *pbyACKRate, unsigned char *pbyACKRate,
unsigned char *pbyCCKBasicRate, unsigned char *pbyCCKBasicRate,
unsigned char *pbyOFDMBasicRate unsigned char *pbyOFDMBasicRate
); );
/* /*
bool bool
VNTWIFIbInit( VNTWIFIbInit(
void *pAdapterHandler, void *pAdapterHandler,
void **pMgmtHandler void **pMgmtHandler
); );
*/ */
unsigned char unsigned char
VNTWIFIbyGetKeyCypher( VNTWIFIbyGetKeyCypher(
void *pMgmtHandle, void *pMgmtHandle,
bool bGroupKey bool bGroupKey
); );
bool bool
VNTWIFIbSetPMKIDCache ( VNTWIFIbSetPMKIDCache(
void *pMgmtObject, void *pMgmtObject,
unsigned long ulCount, unsigned long ulCount,
void *pPMKIDInfo void *pPMKIDInfo
); );
bool bool
VNTWIFIbCommandRunning ( VNTWIFIbCommandRunning(
void *pMgmtObject void *pMgmtObject
); );
unsigned short unsigned short
VNTWIFIwGetMaxSupportRate( VNTWIFIwGetMaxSupportRate(
void *pMgmtObject void *pMgmtObject
); );
// for 802.11h // for 802.11h
void void
VNTWIFIvSet11h ( VNTWIFIvSet11h(
void *pMgmtObject, void *pMgmtObject,
bool b11hEnable bool b11hEnable
); );
bool bool
VNTWIFIbMeasureReport( VNTWIFIbMeasureReport(
...@@ -289,19 +289,19 @@ VNTWIFIbMeasureReport( ...@@ -289,19 +289,19 @@ VNTWIFIbMeasureReport(
unsigned char byBasicMap, unsigned char byBasicMap,
unsigned char byCCAFraction, unsigned char byCCAFraction,
unsigned char *pbyRPIs unsigned char *pbyRPIs
); );
bool bool
VNTWIFIbChannelSwitch( VNTWIFIbChannelSwitch(
void *pMgmtObject, void *pMgmtObject,
unsigned char byNewChannel unsigned char byNewChannel
); );
/* /*
bool bool
VNTWIFIbRadarPresent( VNTWIFIbRadarPresent(
void *pMgmtObject, void *pMgmtObject,
unsigned char byChannel unsigned char byChannel
); );
*/ */
#endif //__VNTWIFI_H__ #endif //__VNTWIFI_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