forked from Minki/linux
staging:vt6655:datarate: Whitespace cleanups
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>
This commit is contained in:
Joe Perches
Greg Kroah-Hartman
parent
9aa69c9ad0
commit
b8314cfc88
@ -51,10 +51,10 @@
|
||||
/*--------------------- Static Classes ----------------------------*/
|
||||
|
||||
|
||||
extern unsigned short TxRate_iwconfig; //2008-5-8 <add> by chester
|
||||
extern unsigned short TxRate_iwconfig; //2008-5-8 <add> by chester
|
||||
/*--------------------- Static Variables --------------------------*/
|
||||
//static int msglevel =MSG_LEVEL_DEBUG;
|
||||
static int msglevel =MSG_LEVEL_INFO;
|
||||
static int msglevel = MSG_LEVEL_INFO;
|
||||
const unsigned char acbyIERate[MAX_RATE] =
|
||||
{0x02, 0x04, 0x0B, 0x16, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
|
||||
|
||||
@ -64,24 +64,24 @@ const unsigned char acbyIERate[MAX_RATE] =
|
||||
|
||||
/*--------------------- Static Functions --------------------------*/
|
||||
|
||||
void s_vResetCounter (
|
||||
PKnownNodeDB psNodeDBTable
|
||||
);
|
||||
void s_vResetCounter(
|
||||
PKnownNodeDB psNodeDBTable
|
||||
);
|
||||
|
||||
|
||||
|
||||
void
|
||||
s_vResetCounter (
|
||||
PKnownNodeDB psNodeDBTable
|
||||
)
|
||||
s_vResetCounter(
|
||||
PKnownNodeDB psNodeDBTable
|
||||
)
|
||||
{
|
||||
unsigned char ii;
|
||||
unsigned char ii;
|
||||
|
||||
// clear statistic counter for auto_rate
|
||||
for(ii=0;ii<=MAX_RATE;ii++) {
|
||||
psNodeDBTable->uTxOk[ii] = 0;
|
||||
psNodeDBTable->uTxFail[ii] = 0;
|
||||
}
|
||||
// clear statistic counter for auto_rate
|
||||
for (ii = 0; ii <= MAX_RATE; ii++) {
|
||||
psNodeDBTable->uTxOk[ii] = 0;
|
||||
psNodeDBTable->uTxFail[ii] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*--------------------- Export Variables --------------------------*/
|
||||
@ -103,22 +103,22 @@ s_vResetCounter (
|
||||
*
|
||||
* Return Value: RateIdx
|
||||
*
|
||||
-*/
|
||||
-*/
|
||||
unsigned char
|
||||
DATARATEbyGetRateIdx (
|
||||
unsigned char byRate
|
||||
)
|
||||
DATARATEbyGetRateIdx(
|
||||
unsigned char byRate
|
||||
)
|
||||
{
|
||||
unsigned char ii;
|
||||
unsigned char ii;
|
||||
|
||||
//Erase basicRate flag.
|
||||
byRate = byRate & 0x7F;//0111 1111
|
||||
//Erase basicRate flag.
|
||||
byRate = byRate & 0x7F;//0111 1111
|
||||
|
||||
for (ii = 0; ii < MAX_RATE; ii ++) {
|
||||
if (acbyIERate[ii] == byRate)
|
||||
return ii;
|
||||
}
|
||||
return 0;
|
||||
for (ii = 0; ii < MAX_RATE; ii++) {
|
||||
if (acbyIERate[ii] == byRate)
|
||||
return ii;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -137,7 +137,7 @@ DATARATEbyGetRateIdx (
|
||||
*
|
||||
* Return Value: none
|
||||
*
|
||||
-*/
|
||||
-*/
|
||||
#define AUTORATE_TXCNT_THRESHOLD 20
|
||||
#define AUTORATE_INC_THRESHOLD 30
|
||||
|
||||
@ -157,22 +157,22 @@ DATARATEbyGetRateIdx (
|
||||
*
|
||||
* Return Value: RateIdx
|
||||
*
|
||||
-*/
|
||||
-*/
|
||||
unsigned short
|
||||
wGetRateIdx(
|
||||
unsigned char byRate
|
||||
)
|
||||
unsigned char byRate
|
||||
)
|
||||
{
|
||||
unsigned short ii;
|
||||
unsigned short ii;
|
||||
|
||||
//Erase basicRate flag.
|
||||
byRate = byRate & 0x7F;//0111 1111
|
||||
//Erase basicRate flag.
|
||||
byRate = byRate & 0x7F;//0111 1111
|
||||
|
||||
for (ii = 0; ii < MAX_RATE; ii ++) {
|
||||
if (acbyIERate[ii] == byRate)
|
||||
return ii;
|
||||
}
|
||||
return 0;
|
||||
for (ii = 0; ii < MAX_RATE; ii++) {
|
||||
if (acbyIERate[ii] == byRate)
|
||||
return ii;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*+
|
||||
@ -193,99 +193,99 @@ wGetRateIdx(
|
||||
*
|
||||
* Return Value: none
|
||||
*
|
||||
-*/
|
||||
-*/
|
||||
void
|
||||
RATEvParseMaxRate (
|
||||
void *pDeviceHandler,
|
||||
PWLAN_IE_SUPP_RATES pItemRates,
|
||||
PWLAN_IE_SUPP_RATES pItemExtRates,
|
||||
bool bUpdateBasicRate,
|
||||
unsigned short *pwMaxBasicRate,
|
||||
unsigned short *pwMaxSuppRate,
|
||||
unsigned short *pwSuppRate,
|
||||
unsigned char *pbyTopCCKRate,
|
||||
unsigned char *pbyTopOFDMRate
|
||||
)
|
||||
RATEvParseMaxRate(
|
||||
void *pDeviceHandler,
|
||||
PWLAN_IE_SUPP_RATES pItemRates,
|
||||
PWLAN_IE_SUPP_RATES pItemExtRates,
|
||||
bool bUpdateBasicRate,
|
||||
unsigned short *pwMaxBasicRate,
|
||||
unsigned short *pwMaxSuppRate,
|
||||
unsigned short *pwSuppRate,
|
||||
unsigned char *pbyTopCCKRate,
|
||||
unsigned char *pbyTopOFDMRate
|
||||
)
|
||||
{
|
||||
PSDevice pDevice = (PSDevice) pDeviceHandler;
|
||||
unsigned int ii;
|
||||
unsigned char byHighSuppRate = 0;
|
||||
unsigned char byRate = 0;
|
||||
unsigned short wOldBasicRate = pDevice->wBasicRate;
|
||||
unsigned int uRateLen;
|
||||
PSDevice pDevice = (PSDevice) pDeviceHandler;
|
||||
unsigned int ii;
|
||||
unsigned char byHighSuppRate = 0;
|
||||
unsigned char byRate = 0;
|
||||
unsigned short wOldBasicRate = pDevice->wBasicRate;
|
||||
unsigned int uRateLen;
|
||||
|
||||
|
||||
if (pItemRates == NULL)
|
||||
return;
|
||||
if (pItemRates == NULL)
|
||||
return;
|
||||
|
||||
*pwSuppRate = 0;
|
||||
uRateLen = pItemRates->len;
|
||||
*pwSuppRate = 0;
|
||||
uRateLen = pItemRates->len;
|
||||
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate Len: %d\n", uRateLen);
|
||||
if (pDevice->eCurrentPHYType != PHY_TYPE_11B) {
|
||||
if (uRateLen > WLAN_RATES_MAXLEN)
|
||||
uRateLen = WLAN_RATES_MAXLEN;
|
||||
} else {
|
||||
if (uRateLen > WLAN_RATES_MAXLEN_11B)
|
||||
uRateLen = WLAN_RATES_MAXLEN_11B;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ParseMaxRate Len: %d\n", uRateLen);
|
||||
if (pDevice->eCurrentPHYType != PHY_TYPE_11B) {
|
||||
if (uRateLen > WLAN_RATES_MAXLEN)
|
||||
uRateLen = WLAN_RATES_MAXLEN;
|
||||
} else {
|
||||
if (uRateLen > WLAN_RATES_MAXLEN_11B)
|
||||
uRateLen = WLAN_RATES_MAXLEN_11B;
|
||||
}
|
||||
|
||||
for (ii = 0; ii < uRateLen; ii++) {
|
||||
byRate = (unsigned char)(pItemRates->abyRates[ii]);
|
||||
if (WLAN_MGMT_IS_BASICRATE(byRate) &&
|
||||
(bUpdateBasicRate == true)) {
|
||||
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
|
||||
CARDbAddBasicRate((void *)pDevice, wGetRateIdx(byRate));
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
|
||||
}
|
||||
byRate = (unsigned char)(pItemRates->abyRates[ii]&0x7F);
|
||||
if (byHighSuppRate == 0)
|
||||
byHighSuppRate = byRate;
|
||||
if (byRate > byHighSuppRate)
|
||||
byHighSuppRate = byRate;
|
||||
*pwSuppRate |= (1<<wGetRateIdx(byRate));
|
||||
}
|
||||
if ((pItemExtRates != NULL) && (pItemExtRates->byElementID == WLAN_EID_EXTSUPP_RATES) &&
|
||||
(pDevice->eCurrentPHYType != PHY_TYPE_11B)) {
|
||||
for (ii = 0; ii < uRateLen; ii++) {
|
||||
byRate = (unsigned char)(pItemRates->abyRates[ii]);
|
||||
if (WLAN_MGMT_IS_BASICRATE(byRate) &&
|
||||
(bUpdateBasicRate == true)) {
|
||||
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
|
||||
CARDbAddBasicRate((void *)pDevice, wGetRateIdx(byRate));
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
|
||||
}
|
||||
byRate = (unsigned char)(pItemRates->abyRates[ii]&0x7F);
|
||||
if (byHighSuppRate == 0)
|
||||
byHighSuppRate = byRate;
|
||||
if (byRate > byHighSuppRate)
|
||||
byHighSuppRate = byRate;
|
||||
*pwSuppRate |= (1<<wGetRateIdx(byRate));
|
||||
}
|
||||
if ((pItemExtRates != NULL) && (pItemExtRates->byElementID == WLAN_EID_EXTSUPP_RATES) &&
|
||||
(pDevice->eCurrentPHYType != PHY_TYPE_11B)) {
|
||||
|
||||
unsigned int uExtRateLen = pItemExtRates->len;
|
||||
unsigned int uExtRateLen = pItemExtRates->len;
|
||||
|
||||
if (uExtRateLen > WLAN_RATES_MAXLEN)
|
||||
uExtRateLen = WLAN_RATES_MAXLEN;
|
||||
if (uExtRateLen > WLAN_RATES_MAXLEN)
|
||||
uExtRateLen = WLAN_RATES_MAXLEN;
|
||||
|
||||
for (ii = 0; ii < uExtRateLen ; ii++) {
|
||||
byRate = (unsigned char)(pItemExtRates->abyRates[ii]);
|
||||
// select highest basic rate
|
||||
if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) {
|
||||
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
|
||||
CARDbAddBasicRate((void *)pDevice, wGetRateIdx(byRate));
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
|
||||
}
|
||||
byRate = (unsigned char)(pItemExtRates->abyRates[ii]&0x7F);
|
||||
if (byHighSuppRate == 0)
|
||||
byHighSuppRate = byRate;
|
||||
if (byRate > byHighSuppRate)
|
||||
byHighSuppRate = byRate;
|
||||
*pwSuppRate |= (1<<wGetRateIdx(byRate));
|
||||
//DBG_PRN_GRP09(("ParseMaxRate : HighSuppRate: %d, %X\n", wGetRateIdx(byRate), byRate));
|
||||
}
|
||||
} //if(pItemExtRates != NULL)
|
||||
for (ii = 0; ii < uExtRateLen; ii++) {
|
||||
byRate = (unsigned char)(pItemExtRates->abyRates[ii]);
|
||||
// select highest basic rate
|
||||
if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) {
|
||||
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
|
||||
CARDbAddBasicRate((void *)pDevice, wGetRateIdx(byRate));
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
|
||||
}
|
||||
byRate = (unsigned char)(pItemExtRates->abyRates[ii]&0x7F);
|
||||
if (byHighSuppRate == 0)
|
||||
byHighSuppRate = byRate;
|
||||
if (byRate > byHighSuppRate)
|
||||
byHighSuppRate = byRate;
|
||||
*pwSuppRate |= (1<<wGetRateIdx(byRate));
|
||||
//DBG_PRN_GRP09(("ParseMaxRate : HighSuppRate: %d, %X\n", wGetRateIdx(byRate), byRate));
|
||||
}
|
||||
} //if (pItemExtRates != NULL)
|
||||
|
||||
if ((pDevice->byPacketType == PK_TYPE_11GB) && CARDbIsOFDMinBasicRate((void *)pDevice)) {
|
||||
pDevice->byPacketType = PK_TYPE_11GA;
|
||||
}
|
||||
if ((pDevice->byPacketType == PK_TYPE_11GB) && CARDbIsOFDMinBasicRate((void *)pDevice)) {
|
||||
pDevice->byPacketType = PK_TYPE_11GA;
|
||||
}
|
||||
|
||||
*pbyTopCCKRate = pDevice->byTopCCKBasicRate;
|
||||
*pbyTopOFDMRate = pDevice->byTopOFDMBasicRate;
|
||||
*pwMaxSuppRate = wGetRateIdx(byHighSuppRate);
|
||||
if ((pDevice->byPacketType==PK_TYPE_11B) || (pDevice->byPacketType==PK_TYPE_11GB))
|
||||
*pwMaxBasicRate = pDevice->byTopCCKBasicRate;
|
||||
else
|
||||
*pwMaxBasicRate = pDevice->byTopOFDMBasicRate;
|
||||
if (wOldBasicRate != pDevice->wBasicRate)
|
||||
CARDvSetRSPINF((void *)pDevice, pDevice->eCurrentPHYType);
|
||||
*pbyTopCCKRate = pDevice->byTopCCKBasicRate;
|
||||
*pbyTopOFDMRate = pDevice->byTopOFDMBasicRate;
|
||||
*pwMaxSuppRate = wGetRateIdx(byHighSuppRate);
|
||||
if ((pDevice->byPacketType == PK_TYPE_11B) || (pDevice->byPacketType == PK_TYPE_11GB))
|
||||
*pwMaxBasicRate = pDevice->byTopCCKBasicRate;
|
||||
else
|
||||
*pwMaxBasicRate = pDevice->byTopOFDMBasicRate;
|
||||
if (wOldBasicRate != pDevice->wBasicRate)
|
||||
CARDvSetRSPINF((void *)pDevice, pDevice->eCurrentPHYType);
|
||||
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n");
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Exit ParseMaxRate\n");
|
||||
}
|
||||
|
||||
|
||||
@ -303,96 +303,96 @@ unsigned int uRateLen;
|
||||
*
|
||||
* Return Value: none
|
||||
*
|
||||
-*/
|
||||
-*/
|
||||
#define AUTORATE_TXCNT_THRESHOLD 20
|
||||
#define AUTORATE_INC_THRESHOLD 30
|
||||
|
||||
void
|
||||
RATEvTxRateFallBack (
|
||||
void *pDeviceHandler,
|
||||
PKnownNodeDB psNodeDBTable
|
||||
)
|
||||
RATEvTxRateFallBack(
|
||||
void *pDeviceHandler,
|
||||
PKnownNodeDB psNodeDBTable
|
||||
)
|
||||
{
|
||||
PSDevice pDevice = (PSDevice) pDeviceHandler;
|
||||
unsigned short wIdxDownRate = 0;
|
||||
unsigned int ii;
|
||||
PSDevice pDevice = (PSDevice) pDeviceHandler;
|
||||
unsigned short wIdxDownRate = 0;
|
||||
unsigned int ii;
|
||||
//unsigned long dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54};
|
||||
bool bAutoRate[MAX_RATE] = {true,true,true,true,false,false,true,true,true,true,true,true};
|
||||
bool bAutoRate[MAX_RATE] = {true, true, true, true, false, false, true, true, true, true, true, true};
|
||||
unsigned long dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540};
|
||||
unsigned long dwThroughput = 0;
|
||||
unsigned short wIdxUpRate = 0;
|
||||
unsigned long dwTxDiff = 0;
|
||||
|
||||
if (pDevice->pMgmt->eScanState != WMAC_NO_SCANNING) {
|
||||
// Don't do Fallback when scanning Channel
|
||||
return;
|
||||
}
|
||||
if (pDevice->pMgmt->eScanState != WMAC_NO_SCANNING) {
|
||||
// Don't do Fallback when scanning Channel
|
||||
return;
|
||||
}
|
||||
|
||||
psNodeDBTable->uTimeCount ++;
|
||||
psNodeDBTable->uTimeCount++;
|
||||
|
||||
if (psNodeDBTable->uTxFail[MAX_RATE] > psNodeDBTable->uTxOk[MAX_RATE])
|
||||
dwTxDiff = psNodeDBTable->uTxFail[MAX_RATE] - psNodeDBTable->uTxOk[MAX_RATE];
|
||||
if (psNodeDBTable->uTxFail[MAX_RATE] > psNodeDBTable->uTxOk[MAX_RATE])
|
||||
dwTxDiff = psNodeDBTable->uTxFail[MAX_RATE] - psNodeDBTable->uTxOk[MAX_RATE];
|
||||
|
||||
if ((psNodeDBTable->uTxOk[MAX_RATE] < AUTORATE_TXOK_CNT) &&
|
||||
(dwTxDiff < AUTORATE_TXFAIL_CNT) &&
|
||||
(psNodeDBTable->uTimeCount < AUTORATE_TIMEOUT)) {
|
||||
return;
|
||||
}
|
||||
if ((psNodeDBTable->uTxOk[MAX_RATE] < AUTORATE_TXOK_CNT) &&
|
||||
(dwTxDiff < AUTORATE_TXFAIL_CNT) &&
|
||||
(psNodeDBTable->uTimeCount < AUTORATE_TIMEOUT)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (psNodeDBTable->uTimeCount >= AUTORATE_TIMEOUT) {
|
||||
psNodeDBTable->uTimeCount = 0;
|
||||
}
|
||||
if (psNodeDBTable->uTimeCount >= AUTORATE_TIMEOUT) {
|
||||
psNodeDBTable->uTimeCount = 0;
|
||||
}
|
||||
|
||||
|
||||
for(ii=0;ii<MAX_RATE;ii++) {
|
||||
if (psNodeDBTable->wSuppRate & (0x0001<<ii)) {
|
||||
if (bAutoRate[ii] == true) {
|
||||
wIdxUpRate = (unsigned short) ii;
|
||||
}
|
||||
} else {
|
||||
bAutoRate[ii] = false;
|
||||
}
|
||||
}
|
||||
for (ii = 0; ii < MAX_RATE; ii++) {
|
||||
if (psNodeDBTable->wSuppRate & (0x0001<<ii)) {
|
||||
if (bAutoRate[ii] == true) {
|
||||
wIdxUpRate = (unsigned short) ii;
|
||||
}
|
||||
} else {
|
||||
bAutoRate[ii] = false;
|
||||
}
|
||||
}
|
||||
|
||||
for(ii=0;ii<=psNodeDBTable->wTxDataRate;ii++) {
|
||||
if ( (psNodeDBTable->uTxOk[ii] != 0) ||
|
||||
(psNodeDBTable->uTxFail[ii] != 0) ) {
|
||||
dwThroughputTbl[ii] *= psNodeDBTable->uTxOk[ii];
|
||||
if (ii < RATE_11M) {
|
||||
psNodeDBTable->uTxFail[ii] *= 4;
|
||||
}
|
||||
dwThroughputTbl[ii] /= (psNodeDBTable->uTxOk[ii] + psNodeDBTable->uTxFail[ii]);
|
||||
}
|
||||
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Rate %d,Ok: %d, Fail:%d, Throughput:%d\n",
|
||||
for (ii = 0; ii <= psNodeDBTable->wTxDataRate; ii++) {
|
||||
if ((psNodeDBTable->uTxOk[ii] != 0) ||
|
||||
(psNodeDBTable->uTxFail[ii] != 0)) {
|
||||
dwThroughputTbl[ii] *= psNodeDBTable->uTxOk[ii];
|
||||
if (ii < RATE_11M) {
|
||||
psNodeDBTable->uTxFail[ii] *= 4;
|
||||
}
|
||||
dwThroughputTbl[ii] /= (psNodeDBTable->uTxOk[ii] + psNodeDBTable->uTxFail[ii]);
|
||||
}
|
||||
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rate %d,Ok: %d, Fail:%d, Throughput:%d\n",
|
||||
// ii, psNodeDBTable->uTxOk[ii], psNodeDBTable->uTxFail[ii], dwThroughputTbl[ii]);
|
||||
}
|
||||
dwThroughput = dwThroughputTbl[psNodeDBTable->wTxDataRate];
|
||||
}
|
||||
dwThroughput = dwThroughputTbl[psNodeDBTable->wTxDataRate];
|
||||
|
||||
wIdxDownRate = psNodeDBTable->wTxDataRate;
|
||||
for(ii = psNodeDBTable->wTxDataRate; ii > 0;) {
|
||||
ii--;
|
||||
if ( (dwThroughputTbl[ii] > dwThroughput) &&
|
||||
(bAutoRate[ii]==true) ) {
|
||||
dwThroughput = dwThroughputTbl[ii];
|
||||
wIdxDownRate = (unsigned short) ii;
|
||||
}
|
||||
}
|
||||
psNodeDBTable->wTxDataRate = wIdxDownRate;
|
||||
if (psNodeDBTable->uTxOk[MAX_RATE]) {
|
||||
if (psNodeDBTable->uTxOk[MAX_RATE] >
|
||||
(psNodeDBTable->uTxFail[MAX_RATE] * 4) ) {
|
||||
psNodeDBTable->wTxDataRate = wIdxUpRate;
|
||||
}
|
||||
}else { // adhoc, if uTxOk =0 & uTxFail = 0
|
||||
if (psNodeDBTable->uTxFail[MAX_RATE] == 0)
|
||||
psNodeDBTable->wTxDataRate = wIdxUpRate;
|
||||
}
|
||||
wIdxDownRate = psNodeDBTable->wTxDataRate;
|
||||
for (ii = psNodeDBTable->wTxDataRate; ii > 0;) {
|
||||
ii--;
|
||||
if ((dwThroughputTbl[ii] > dwThroughput) &&
|
||||
(bAutoRate[ii] == true)) {
|
||||
dwThroughput = dwThroughputTbl[ii];
|
||||
wIdxDownRate = (unsigned short) ii;
|
||||
}
|
||||
}
|
||||
psNodeDBTable->wTxDataRate = wIdxDownRate;
|
||||
if (psNodeDBTable->uTxOk[MAX_RATE]) {
|
||||
if (psNodeDBTable->uTxOk[MAX_RATE] >
|
||||
(psNodeDBTable->uTxFail[MAX_RATE] * 4)) {
|
||||
psNodeDBTable->wTxDataRate = wIdxUpRate;
|
||||
}
|
||||
} else { // adhoc, if uTxOk =0 & uTxFail = 0
|
||||
if (psNodeDBTable->uTxFail[MAX_RATE] == 0)
|
||||
psNodeDBTable->wTxDataRate = wIdxUpRate;
|
||||
}
|
||||
//2008-5-8 <add> by chester
|
||||
TxRate_iwconfig=psNodeDBTable->wTxDataRate;
|
||||
s_vResetCounter(psNodeDBTable);
|
||||
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Rate: %d, U:%d, D:%d\n", psNodeDBTable->wTxDataRate, wIdxUpRate, wIdxDownRate);
|
||||
TxRate_iwconfig = psNodeDBTable->wTxDataRate;
|
||||
s_vResetCounter(psNodeDBTable);
|
||||
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rate: %d, U:%d, D:%d\n", psNodeDBTable->wTxDataRate, wIdxUpRate, wIdxDownRate);
|
||||
|
||||
return;
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
@ -408,30 +408,30 @@ TxRate_iwconfig=psNodeDBTable->wTxDataRate;
|
||||
*
|
||||
* Return Value: None
|
||||
*
|
||||
-*/
|
||||
-*/
|
||||
unsigned char
|
||||
RATEuSetIE (
|
||||
PWLAN_IE_SUPP_RATES pSrcRates,
|
||||
PWLAN_IE_SUPP_RATES pDstRates,
|
||||
unsigned int uRateLen
|
||||
)
|
||||
RATEuSetIE(
|
||||
PWLAN_IE_SUPP_RATES pSrcRates,
|
||||
PWLAN_IE_SUPP_RATES pDstRates,
|
||||
unsigned int uRateLen
|
||||
)
|
||||
{
|
||||
unsigned int ii, uu, uRateCnt = 0;
|
||||
unsigned int ii, uu, uRateCnt = 0;
|
||||
|
||||
if ((pSrcRates == NULL) || (pDstRates == NULL))
|
||||
return 0;
|
||||
if ((pSrcRates == NULL) || (pDstRates == NULL))
|
||||
return 0;
|
||||
|
||||
if (pSrcRates->len == 0)
|
||||
return 0;
|
||||
if (pSrcRates->len == 0)
|
||||
return 0;
|
||||
|
||||
for (ii = 0; ii < uRateLen; ii++) {
|
||||
for (uu = 0; uu < pSrcRates->len; uu++) {
|
||||
if ((pSrcRates->abyRates[uu] & 0x7F) == acbyIERate[ii]) {
|
||||
pDstRates->abyRates[uRateCnt ++] = pSrcRates->abyRates[uu];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return (unsigned char)uRateCnt;
|
||||
for (ii = 0; ii < uRateLen; ii++) {
|
||||
for (uu = 0; uu < pSrcRates->len; uu++) {
|
||||
if ((pSrcRates->abyRates[uu] & 0x7F) == acbyIERate[ii]) {
|
||||
pDstRates->abyRates[uRateCnt++] = pSrcRates->abyRates[uu];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return (unsigned char)uRateCnt;
|
||||
}
|
||||
|
||||
|
||||
@ -56,40 +56,40 @@
|
||||
|
||||
void
|
||||
RATEvParseMaxRate(
|
||||
void *pDeviceHandler,
|
||||
PWLAN_IE_SUPP_RATES pItemRates,
|
||||
PWLAN_IE_SUPP_RATES pItemExtRates,
|
||||
bool bUpdateBasicRate,
|
||||
unsigned short *pwMaxBasicRate,
|
||||
unsigned short *pwMaxSuppRate,
|
||||
unsigned short *pwSuppRate,
|
||||
unsigned char *pbyTopCCKRate,
|
||||
unsigned char *pbyTopOFDMRate
|
||||
);
|
||||
void *pDeviceHandler,
|
||||
PWLAN_IE_SUPP_RATES pItemRates,
|
||||
PWLAN_IE_SUPP_RATES pItemExtRates,
|
||||
bool bUpdateBasicRate,
|
||||
unsigned short *pwMaxBasicRate,
|
||||
unsigned short *pwMaxSuppRate,
|
||||
unsigned short *pwSuppRate,
|
||||
unsigned char *pbyTopCCKRate,
|
||||
unsigned char *pbyTopOFDMRate
|
||||
);
|
||||
|
||||
void
|
||||
RATEvTxRateFallBack(
|
||||
void *pDeviceHandler,
|
||||
PKnownNodeDB psNodeDBTable
|
||||
);
|
||||
void *pDeviceHandler,
|
||||
PKnownNodeDB psNodeDBTable
|
||||
);
|
||||
|
||||
unsigned char
|
||||
RATEuSetIE(
|
||||
PWLAN_IE_SUPP_RATES pSrcRates,
|
||||
PWLAN_IE_SUPP_RATES pDstRates,
|
||||
unsigned int uRateLen
|
||||
);
|
||||
PWLAN_IE_SUPP_RATES pSrcRates,
|
||||
PWLAN_IE_SUPP_RATES pDstRates,
|
||||
unsigned int uRateLen
|
||||
);
|
||||
|
||||
unsigned short
|
||||
wGetRateIdx(
|
||||
unsigned char byRate
|
||||
);
|
||||
unsigned char byRate
|
||||
);
|
||||
|
||||
|
||||
unsigned char
|
||||
DATARATEbyGetRateIdx(
|
||||
unsigned char byRate
|
||||
);
|
||||
unsigned char byRate
|
||||
);
|
||||
|
||||
|
||||
#endif //__DATARATE_H__
|
||||
|
||||
Loading…
Reference in New Issue
Block a user