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 @@
*
* Return Value: none
*
-*/
-*/
void
VNTWIFIvSetOPMode (
VNTWIFIvSetOPMode(
void *pMgmtHandle,
WMAC_CONFIG_MODE eOPMode
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -95,14 +95,14 @@ VNTWIFIvSetOPMode (
*
* Return Value: none
*
-*/
-*/
void
VNTWIFIvSetIBSSParameter (
VNTWIFIvSetIBSSParameter(
void *pMgmtHandle,
unsigned short wBeaconPeriod,
unsigned short wATIMWindow,
unsigned int uChannel
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -124,11 +124,11 @@ VNTWIFIvSetIBSSParameter (
*
* Return Value: current SSID pointer.
*
-*/
-*/
PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID (
VNTWIFIpGetCurrentSSID(
void *pMgmtHandle
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
return((PWLAN_IE_SSID) pMgmt->abyCurrSSID);
......@@ -147,11 +147,11 @@ VNTWIFIpGetCurrentSSID (
*
* Return Value: current Channel.
*
-*/
-*/
unsigned int
VNTWIFIpGetCurrentChannel (
VNTWIFIpGetCurrentChannel(
void *pMgmtHandle
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
if (pMgmtHandle != NULL) {
......@@ -173,11 +173,11 @@ VNTWIFIpGetCurrentChannel (
*
* Return Value: current Assoc ID
*
-*/
-*/
unsigned short
VNTWIFIwGetAssocID (
VNTWIFIwGetAssocID(
void *pMgmtHandle
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
return(pMgmt->wCurrAID);
......@@ -199,12 +199,12 @@ VNTWIFIwGetAssocID (
*
* Return Value: max support rate
*
-*/
-*/
unsigned char
VNTWIFIbyGetMaxSupportRate (
VNTWIFIbyGetMaxSupportRate(
PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs
)
)
{
unsigned char byMaxSupportRate = RATE_1M;
unsigned char bySupportRate = RATE_1M;
......@@ -245,13 +245,13 @@ VNTWIFIbyGetMaxSupportRate (
*
* Return Value: max support rate
*
-*/
-*/
unsigned char
VNTWIFIbyGetACKTxRate (
VNTWIFIbyGetACKTxRate(
unsigned char byRxDataRate,
PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs
)
)
{
unsigned char byMaxAckRate;
unsigned char byBasicRate;
......@@ -303,12 +303,12 @@ VNTWIFIbyGetACKTxRate (
*
* Return Value: none
*
-*/
-*/
void
VNTWIFIvSetAuthenticationMode (
VNTWIFIvSetAuthenticationMode(
void *pMgmtHandle,
WMAC_AUTHENTICATION_MODE eAuthMode
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -335,19 +335,19 @@ VNTWIFIvSetAuthenticationMode (
*
* Return Value: none
*
-*/
-*/
void
VNTWIFIvSetEncryptionMode (
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) ) {
(eEncryptionMode == WMAC_ENCRYPTION_AESEnabled)) {
pMgmt->bPrivacyInvoked = true;
} else {
pMgmt->bPrivacyInvoked = false;
......@@ -357,16 +357,16 @@ VNTWIFIvSetEncryptionMode (
bool
VNTWIFIbConfigPhyMode (
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) {
if (CARDbSetPhyParameter(pMgmt->pAdapter, ePhyType, 0, 0, NULL, NULL) == true) {
pMgmt->eCurrentPHYMode = ePhyType;
} else {
return(false);
......@@ -378,10 +378,10 @@ VNTWIFIbConfigPhyMode (
void
VNTWIFIbGetConfigPhyMode (
VNTWIFIbGetConfigPhyMode(
void *pMgmtHandle,
void *pePhyType
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -403,7 +403,7 @@ VNTWIFIbGetConfigPhyMode (
*
* Return Value: None.
*
-*/
-*/
/*+
......@@ -420,7 +420,7 @@ VNTWIFIbGetConfigPhyMode (
*
* Return Value: None.
*
-*/
-*/
void
VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirstBSS)
......@@ -449,11 +449,11 @@ VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirst
void
VNTWIFIvGetNextBSS (
VNTWIFIvGetNextBSS(
void *pMgmtHandle,
void *pvCurrentBSS,
void **pvNextBSS
)
)
{
PKnownBSS pBSS = (PKnownBSS) pvCurrentBSS;
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -487,7 +487,7 @@ VNTWIFIvGetNextBSS (
*
* Return Value: none
*
-*/
-*/
void
VNTWIFIvUpdateNodeTxCounter(
void *pMgmtHandle,
......@@ -495,7 +495,7 @@ VNTWIFIvUpdateNodeTxCounter(
bool bTxOk,
unsigned short wRate,
unsigned char *pbyTxFailCount
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
unsigned int uNodeIndex = 0;
......@@ -516,7 +516,7 @@ VNTWIFIvUpdateNodeTxCounter(
pMgmt->sNodeDBTable[uNodeIndex].uTxFailures++;
}
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];
}
return;
......@@ -531,7 +531,7 @@ VNTWIFIvGetTxRate(
unsigned char *pbyACKRate,
unsigned char *pbyCCKBasicRate,
unsigned char *pbyOFDMBasicRate
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
unsigned int uNodeIndex = 0;
......@@ -546,7 +546,7 @@ VNTWIFIvGetTxRate(
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)) {
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);
......@@ -571,21 +571,21 @@ VNTWIFIvGetTxRate(
pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates;
pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates;
}
byACKRate = VNTWIFIbyGetACKTxRate( (unsigned char) wTxDataRate,
byACKRate = VNTWIFIbyGetACKTxRate((unsigned char) wTxDataRate,
pSupportRateIEs,
pExtSupportRateIEs
);
);
if (byACKRate > (unsigned char) wTxDataRate) {
byACKRate = (unsigned char) wTxDataRate;
}
byCCKBasicRate = VNTWIFIbyGetACKTxRate( RATE_11M,
byCCKBasicRate = VNTWIFIbyGetACKTxRate(RATE_11M,
pSupportRateIEs,
pExtSupportRateIEs
);
);
byOFDMBasicRate = VNTWIFIbyGetACKTxRate(RATE_54M,
pSupportRateIEs,
pExtSupportRateIEs
);
);
*pwTxDataRate = wTxDataRate;
*pbyACKRate = byACKRate;
*pbyCCKBasicRate = byCCKBasicRate;
......@@ -597,7 +597,7 @@ unsigned char
VNTWIFIbyGetKeyCypher(
void *pMgmtHandle,
bool bGroupKey
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -610,12 +610,12 @@ VNTWIFIbyGetKeyCypher(
/*
bool
VNTWIFIbInit(
bool
VNTWIFIbInit(
void *pAdapterHandler,
void **pMgmtHandler
)
{
)
{
PSMgmtObject pMgmt = NULL;
unsigned int ii;
......@@ -631,7 +631,7 @@ VNTWIFIbInit(
pMgmt->pAdapter = (void *) pAdapterHandler;
// 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->pbyPSPacketPool = &pMgmt->byPSPacketPool[0];
......@@ -649,17 +649,17 @@ VNTWIFIbInit(
*pMgmtHandler = pMgmt;
return true;
}
}
*/
bool
VNTWIFIbSetPMKIDCache (
VNTWIFIbSetPMKIDCache(
void *pMgmtObject,
unsigned long ulCount,
void *pPMKIDInfo
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
......@@ -676,12 +676,12 @@ VNTWIFIbSetPMKIDCache (
unsigned short
VNTWIFIwGetMaxSupportRate(
void *pMgmtObject
)
)
{
unsigned short wRate = RATE_54M;
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)) {
return (wRate);
}
......@@ -695,10 +695,10 @@ VNTWIFIwGetMaxSupportRate(
void
VNTWIFIvSet11h (
VNTWIFIvSet11h(
void *pMgmtObject,
bool b11hEnable
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
......@@ -714,43 +714,43 @@ VNTWIFIbMeasureReport(
unsigned char byBasicMap,
unsigned char byCCAFraction,
unsigned char *pbyRPIs
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
unsigned char *pbyCurrentEID = (unsigned char *) (pMgmt->pCurrMeasureEIDRep);
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->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 :
case MEASURE_TYPE_BASIC:
pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_BASIC);
memcpy( &(pMgmt->pCurrMeasureEIDRep->sRep.sBasic),
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 :
case MEASURE_TYPE_CCA:
pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_CCA);
memcpy( &(pMgmt->pCurrMeasureEIDRep->sRep.sCCA),
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 :
case MEASURE_TYPE_RPI:
pMgmt->pCurrMeasureEIDRep->len += sizeof(MEASEURE_REP_RPI);
memcpy( &(pMgmt->pCurrMeasureEIDRep->sRep.sRPI),
memcpy(&(pMgmt->pCurrMeasureEIDRep->sRep.sRPI),
&(((PWLAN_IE_MEASURE_REQ) pvMeasureEID)->sReq),
sizeof(MEASEURE_REQ));
memcpy(pMgmt->pCurrMeasureEIDRep->sRep.sRPI.abyRPIdensity, pbyRPIs, 8);
break;
default :
default:
break;
}
pbyCurrentEID += (2 + pMgmt->pCurrMeasureEIDRep->len);
......@@ -769,7 +769,7 @@ bool
VNTWIFIbChannelSwitch(
void *pMgmtObject,
unsigned char byNewChannel
)
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
......@@ -781,12 +781,12 @@ VNTWIFIbChannelSwitch(
}
/*
bool
VNTWIFIbRadarPresent(
bool
VNTWIFIbRadarPresent(
void *pMgmtObject,
unsigned char byChannel
)
{
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
(byChannel == (unsigned char) pMgmt->uCurrChannel) &&
......@@ -800,6 +800,6 @@ VNTWIFIbRadarPresent(
CARDbChannelSwitch(pMgmt->pAdapter, 0, pMgmt->byNewChannel, 10);
}
return true;
}
}
*/
drivers/staging/vt6655/vntwifi.h
View file @ d9d644ed
......@@ -141,82 +141,82 @@ typedef enum tagWMAC_POWER_MODE {
/*--------------------- Export Functions --------------------------*/
void
VNTWIFIvSetIBSSParameter (
VNTWIFIvSetIBSSParameter(
void *pMgmtHandle,
unsigned short wBeaconPeriod,
unsigned short wATIMWindow,
unsigned int uChannel
);
);
void
VNTWIFIvSetOPMode (
VNTWIFIvSetOPMode(
void *pMgmtHandle,
WMAC_CONFIG_MODE eOPMode
);
);
PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID(
void *pMgmtHandle
);
);
unsigned int
VNTWIFIpGetCurrentChannel(
void *pMgmtHandle
);
);
unsigned short
VNTWIFIwGetAssocID (
VNTWIFIwGetAssocID(
void *pMgmtHandle
);
);
unsigned char
VNTWIFIbyGetMaxSupportRate (
VNTWIFIbyGetMaxSupportRate(
PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs
);
);
unsigned char
VNTWIFIbyGetACKTxRate (
VNTWIFIbyGetACKTxRate(
unsigned char byRxDataRate,
PWLAN_IE_SUPP_RATES pSupportRateIEs,
PWLAN_IE_SUPP_RATES pExtSupportRateIEs
);
);
void
VNTWIFIvSetAuthenticationMode (
VNTWIFIvSetAuthenticationMode(
void *pMgmtHandle,
WMAC_AUTHENTICATION_MODE eAuthMode
);
);
void
VNTWIFIvSetEncryptionMode (
VNTWIFIvSetEncryptionMode(
void *pMgmtHandle,
WMAC_ENCRYPTION_MODE eEncryptionMode
);
);
bool
VNTWIFIbConfigPhyMode(
void *pMgmtHandle,
CARD_PHY_TYPE ePhyType
);
);
void
VNTWIFIbGetConfigPhyMode(
void *pMgmtHandle,
void *pePhyType
);
);
void
VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount,
void **pvFirstBSS);
void
VNTWIFIvGetNextBSS (
VNTWIFIvGetNextBSS(
void *pMgmtHandle,
void *pvCurrentBSS,
void **pvNextBSS
);
);
......@@ -227,7 +227,7 @@ VNTWIFIvUpdateNodeTxCounter(
bool bTxOk,
unsigned short wRate,
unsigned char *pbyTxFailCount
);
);
void
......@@ -238,47 +238,47 @@ VNTWIFIvGetTxRate(
unsigned char *pbyACKRate,
unsigned char *pbyCCKBasicRate,
unsigned char *pbyOFDMBasicRate
);
);
/*
bool
VNTWIFIbInit(
bool
VNTWIFIbInit(
void *pAdapterHandler,
void **pMgmtHandler
);
);
*/
unsigned char
VNTWIFIbyGetKeyCypher(
void *pMgmtHandle,
bool bGroupKey
);
);
bool
VNTWIFIbSetPMKIDCache (
VNTWIFIbSetPMKIDCache(
void *pMgmtObject,
unsigned long ulCount,
void *pPMKIDInfo
);
);
bool
VNTWIFIbCommandRunning (
VNTWIFIbCommandRunning(
void *pMgmtObject
);
);
unsigned short
VNTWIFIwGetMaxSupportRate(
void *pMgmtObject
);
);
// for 802.11h
void
VNTWIFIvSet11h (
VNTWIFIvSet11h(
void *pMgmtObject,
bool b11hEnable
);
);
bool
VNTWIFIbMeasureReport(
......@@ -289,19 +289,19 @@ VNTWIFIbMeasureReport(
unsigned char byBasicMap,
unsigned char byCCAFraction,
unsigned char *pbyRPIs
);
);
bool
VNTWIFIbChannelSwitch(
void *pMgmtObject,
unsigned char byNewChannel
);
);
/*
bool
VNTWIFIbRadarPresent(
bool
VNTWIFIbRadarPresent(
void *pMgmtObject,
unsigned char byChannel
);
);
*/
#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