Commit bc5cf656 authored by Guido Martínez's avatar Guido Martínez Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: fix checkpatch bracing issues 



This patchs fixes tons of warnings such as:

  WARNING: braces {} are not necessary for single statement blocks
  #354: FILE: drivers/staging/vt6655/wmgr.c:354:
  +       for (ii = 0; ii < WLAN_BSSID_LEN; ii++) {
  +               pMgmt->abyDesireBSSID[ii] = 0xFF;
  +       }

Please note: this patch only fixes bracing issues (and there is still a
lot to do); so if you run checkpatch it _will_ throw a lot of errors.
Use --test-only=braces

Signed-off-by: default avatarGuido Martínez <guido@vanguardiasur.com.ar>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e8a7e5f

drivers/staging/vt6655/baseband.c

+39 −45
Original line number Diff line number Diff line
@@ -1784,29 +1784,27 @@ BBuGetFrameTime( 
	uRate = (unsigned int)awcFrameTime[uRateIdx];



	if (uRateIdx <= 3) {          //CCK mode



		if (byPreambleType == 1) {//Short

		if (byPreambleType == 1) //Short

			uPreamble = 96;

		} else {

		else

			uPreamble = 192;

		}



		uFrameTime = (cbFrameLength * 80) / uRate;  //?????

		uTmp = (uFrameTime * uRate) / 80;

		if (cbFrameLength != uTmp) {

		if (cbFrameLength != uTmp)

			uFrameTime++;

		}



		return uPreamble + uFrameTime;

	} else {

		uFrameTime = (cbFrameLength * 8 + 22) / uRate;   //????????

		uTmp = ((uFrameTime * uRate) - 22) / 8;

		if (cbFrameLength != uTmp) {

		if (cbFrameLength != uTmp)

			uFrameTime++;

		}



		uFrameTime = uFrameTime * 4;    //???????

		if (byPktType != PK_TYPE_11A) {

		if (byPktType != PK_TYPE_11A)

			uFrameTime += 6;     //??????

		}



		return 20 + uFrameTime; //??????

	}

}
@@ -2127,16 +2125,16 @@ bool BBbVT3253Init(PSDevice pDevice) 


	if (byRFType == RF_RFMD2959) {

		if (byLocalID <= REV_ID_VT3253_A1) {

			for (ii = 0; ii < CB_VT3253_INIT_FOR_RFMD; ii++) {

			for (ii = 0; ii < CB_VT3253_INIT_FOR_RFMD; ii++)

				bResult &= BBbWriteEmbedded(dwIoBase, byVT3253InitTab_RFMD[ii][0], byVT3253InitTab_RFMD[ii][1]);

			}



		} else {

			for (ii = 0; ii < CB_VT3253B0_INIT_FOR_RFMD; ii++) {

			for (ii = 0; ii < CB_VT3253B0_INIT_FOR_RFMD; ii++)

				bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_RFMD[ii][0], byVT3253B0_RFMD[ii][1]);

			}

			for (ii = 0; ii < CB_VT3253B0_AGC_FOR_RFMD2959; ii++) {



			for (ii = 0; ii < CB_VT3253B0_AGC_FOR_RFMD2959; ii++)

				bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AGC4_RFMD2959[ii][0], byVT3253B0_AGC4_RFMD2959[ii][1]);

			}



			VNSvOutPortD(dwIoBase + MAC_REG_ITRTMSET, 0x23);

			MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY, BIT0);

		}
@@ -2149,12 +2147,12 @@ bool BBbVT3253Init(PSDevice pDevice) 
		pDevice->ldBmThreshold[2] = 0;

		pDevice->ldBmThreshold[3] = 0;

	} else if ((byRFType == RF_AIROHA) || (byRFType == RF_AL2230S)) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AIROHA2230[ii][0], byVT3253B0_AIROHA2230[ii][1]);

		}

		for (ii = 0; ii < CB_VT3253B0_AGC; ii++) {



		for (ii = 0; ii < CB_VT3253B0_AGC; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);

		}



		pDevice->abyBBVGA[0] = 0x1C;

		pDevice->abyBBVGA[1] = 0x10;

		pDevice->abyBBVGA[2] = 0x0;
@@ -2164,12 +2162,12 @@ bool BBbVT3253Init(PSDevice pDevice) 
		pDevice->ldBmThreshold[2] = 0;

		pDevice->ldBmThreshold[3] = 0;

	} else if (byRFType == RF_UW2451) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_UW2451[ii][0], byVT3253B0_UW2451[ii][1]);

		}

		for (ii = 0; ii < CB_VT3253B0_AGC; ii++) {



		for (ii = 0; ii < CB_VT3253B0_AGC; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);

		}



		VNSvOutPortB(dwIoBase + MAC_REG_ITRTMSET, 0x23);

		MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY, BIT0);
@@ -2182,9 +2180,9 @@ bool BBbVT3253Init(PSDevice pDevice) 
		pDevice->ldBmThreshold[2] = 0;

		pDevice->ldBmThreshold[3] = 0;

	} else if (byRFType == RF_UW2452) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_UW2451[ii][0], byVT3253B0_UW2451[ii][1]);

		}



		// Init ANT B select,TX Config CR09 = 0x61->0x45, 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)

		//bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);

		// Init ANT B select,RX Config CR10 = 0x28->0x2A, 0x2A->0x28(VC1/VC2 define, make the ANT_A, ANT_B inverted)
@@ -2203,9 +2201,8 @@ bool BBbVT3253Init(PSDevice pDevice) 
		//}}

		bResult &= BBbWriteEmbedded(dwIoBase, 0xb0, 0x58);



		for (ii = 0; ii < CB_VT3253B0_AGC; ii++) {

		for (ii = 0; ii < CB_VT3253B0_AGC; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);

		}



		pDevice->abyBBVGA[0] = 0x14;

		pDevice->abyBBVGA[1] = 0x0A;
@@ -2218,12 +2215,12 @@ bool BBbVT3253Init(PSDevice pDevice) 
		//}} RobertYu



	} else if (byRFType == RF_VT3226) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AIROHA2230[ii][0], byVT3253B0_AIROHA2230[ii][1]);

		}

		for (ii = 0; ii < CB_VT3253B0_AGC; ii++) {



		for (ii = 0; ii < CB_VT3253B0_AGC; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);

		}



		pDevice->abyBBVGA[0] = 0x1C;

		pDevice->abyBBVGA[1] = 0x10;

		pDevice->abyBBVGA[2] = 0x0;
@@ -2236,9 +2233,9 @@ bool BBbVT3253Init(PSDevice pDevice) 
		MACvSetRFLE_LatchBase(dwIoBase);

		//{{ RobertYu: 20050104

	} else if (byRFType == RF_AIROHA7230) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) {

		for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AIROHA2230[ii][0], byVT3253B0_AIROHA2230[ii][1]);

		}





		//{{ RobertYu:20050223, request by JerryChung

		// Init ANT B select,TX Config CR09 = 0x61->0x45, 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
@@ -2249,9 +2246,9 @@ bool BBbVT3253Init(PSDevice pDevice) 
		bResult &= BBbWriteEmbedded(dwIoBase, 0xd7, 0x06);

		//}}



		for (ii = 0; ii < CB_VT3253B0_AGC; ii++) {

		for (ii = 0; ii < CB_VT3253B0_AGC; ii++)

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);

		}



		pDevice->abyBBVGA[0] = 0x1C;

		pDevice->abyBBVGA[1] = 0x10;

		pDevice->abyBBVGA[2] = 0x0;
@@ -2407,17 +2404,15 @@ BBvSetShortSlotTime(PSDevice pDevice) 


	BBbReadEmbedded(pDevice->PortOffset, 0x0A, &byBBRxConf);//CR10



	if (pDevice->bShortSlotTime) {

	if (pDevice->bShortSlotTime)

		byBBRxConf &= 0xDF;//1101 1111

	} else {

	else

		byBBRxConf |= 0x20;//0010 0000

	}



	// patch for 3253B0 Baseband with Cardbus module

	BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byBBVGA);

	if (byBBVGA == pDevice->abyBBVGA[0]) {

	if (byBBVGA == pDevice->abyBBVGA[0])

		byBBRxConf |= 0x20;//0010 0000

	}



	BBbWriteEmbedded(pDevice->PortOffset, 0x0A, byBBRxConf);//CR10

}
@@ -2698,10 +2693,9 @@ BBvClearAntDivSQ3Value(PSDevice pDevice) 
	unsigned int ii;



	pDevice->uDiversityCnt = 0;

	for (ii = 0; ii < MAX_RATE; ii++) {

	for (ii = 0; ii < MAX_RATE; ii++)

		pDevice->uNumSQ3[ii] = 0;

}

}



/*

 * Description: Antenna Diversity
@@ -2721,9 +2715,9 @@ BBvClearAntDivSQ3Value(PSDevice pDevice) 
void

BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ3)

{

	if ((byRxRate >= MAX_RATE) || (pDevice->wAntDiversityMaxRate >= MAX_RATE)) {

	if ((byRxRate >= MAX_RATE) || (pDevice->wAntDiversityMaxRate >= MAX_RATE))

		return;

	}



	pDevice->uDiversityCnt++;



	pDevice->uNumSQ3[byRxRate]++;

drivers/staging/vt6655/bssdb.c

+2 −4
Original line number Diff line number Diff line
@@ -497,9 +497,8 @@ BSSbInsertToBSSList( 
		}

	}



	if (bParsingQuiet && (pQuiet != NULL)) {

	if (bParsingQuiet && (pQuiet != NULL))

		CARDbStartQuiet(pMgmt->pAdapter);

	}



	pBSSList->uIELength = uIELength;

	if (pBSSList->uIELength > WLAN_BEACON_FR_MAXLEN)
@@ -662,9 +661,8 @@ BSSbUpdateToBSSList( 
		}

	}



	if (bParsingQuiet && (pQuiet != NULL)) {

	if (bParsingQuiet && (pQuiet != NULL))

		CARDbStartQuiet(pMgmt->pAdapter);

	}



	pBSSList->uIELength = uIELength;

	if (pBSSList->uIELength > WLAN_BEACON_FR_MAXLEN)

drivers/staging/vt6655/card.c

+69 −74
Original line number Diff line number Diff line
@@ -351,9 +351,9 @@ s_vSetRSPINF(PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, v 
bool CARDbIsShortPreamble(void *pDeviceHandler)

{

	PSDevice    pDevice = (PSDevice) pDeviceHandler;

	if (pDevice->byPreambleType == 0) {

	if (pDevice->byPreambleType == 0)

		return false;

	}



	return true;

}
@@ -400,9 +400,9 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned 


	//Set SIFS, DIFS, EIFS, SlotTime, CwMin

	if (ePHYType == PHY_TYPE_11A) {

		if (pSupportRates == NULL) {

		if (pSupportRates == NULL)

			pSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultSuppRatesA;

		}



		if (pDevice->byRFType == RF_AIROHA7230) {

			// AL7230 use single PAPE and connect to PAPE_2.4G

			MACvSetBBType(pDevice->PortOffset, BB_TYPE_11G);
@@ -410,9 +410,9 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned 
			pDevice->abyBBVGA[2] = 0x10;

			pDevice->abyBBVGA[3] = 0x10;

			BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);

			if (byData == 0x1C) {

			if (byData == 0x1C)

				BBbWriteEmbedded(pDevice->PortOffset, 0xE7, pDevice->abyBBVGA[0]);

			}



		} else if (pDevice->byRFType == RF_UW2452) {

			MACvSetBBType(pDevice->PortOffset, BB_TYPE_11A);

			pDevice->abyBBVGA[0] = 0x18;
@@ -430,18 +430,18 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned 
		byDIFS = C_SIFS_A + 2*C_SLOT_SHORT;

		byCWMaxMin = 0xA4;

	} else if (ePHYType == PHY_TYPE_11B) {

		if (pSupportRates == NULL) {

		if (pSupportRates == NULL)

			pSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultSuppRatesB;

		}



		MACvSetBBType(pDevice->PortOffset, BB_TYPE_11B);

		if (pDevice->byRFType == RF_AIROHA7230) {

			pDevice->abyBBVGA[0] = 0x1C;

			pDevice->abyBBVGA[2] = 0x00;

			pDevice->abyBBVGA[3] = 0x00;

			BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);

			if (byData == 0x20) {

			if (byData == 0x20)

				BBbWriteEmbedded(pDevice->PortOffset, 0xE7, pDevice->abyBBVGA[0]);

			}



		} else if (pDevice->byRFType == RF_UW2452) {

			pDevice->abyBBVGA[0] = 0x14;

			BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
@@ -466,9 +466,9 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned 
			pDevice->abyBBVGA[2] = 0x00;

			pDevice->abyBBVGA[3] = 0x00;

			BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);

			if (byData == 0x20) {

			if (byData == 0x20)

				BBbWriteEmbedded(pDevice->PortOffset, 0xE7, pDevice->abyBBVGA[0]);

			}



		} else if (pDevice->byRFType == RF_UW2452) {

			pDevice->abyBBVGA[0] = 0x14;

			BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
@@ -486,28 +486,27 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned 
			bySlot = C_SLOT_LONG;

			byDIFS = C_SIFS_BG + 2*C_SLOT_LONG;

		}

		if (VNTWIFIbyGetMaxSupportRate(pSupportRates, pExtSupportRates) > RATE_11M) {

		if (VNTWIFIbyGetMaxSupportRate(pSupportRates, pExtSupportRates) > RATE_11M)

			byCWMaxMin = 0xA4;

		} else {

		else

			byCWMaxMin = 0xA5;

		}



		if (pDevice->bProtectMode != VNTWIFIbIsProtectMode(byERPField)) {

			pDevice->bProtectMode = VNTWIFIbIsProtectMode(byERPField);

			if (pDevice->bProtectMode) {

			if (pDevice->bProtectMode)

				MACvEnableProtectMD(pDevice->PortOffset);

			} else {

			else

				MACvDisableProtectMD(pDevice->PortOffset);

			}



		}

		if (pDevice->bBarkerPreambleMd != VNTWIFIbIsBarkerMode(byERPField)) {

			pDevice->bBarkerPreambleMd = VNTWIFIbIsBarkerMode(byERPField);

			if (pDevice->bBarkerPreambleMd) {

			if (pDevice->bBarkerPreambleMd)

				MACvEnableBarkerPreambleMd(pDevice->PortOffset);

			} else {

			else

				MACvDisableBarkerPreambleMd(pDevice->PortOffset);

		}

	}

	}



	if (pDevice->byRFType == RF_RFMD2959) {

		// bcs TX_PE will reserve 3 us
@@ -534,22 +533,22 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned 
	if (pDevice->bySlot != bySlot) {

		pDevice->bySlot = bySlot;

		VNSvOutPortB(pDevice->PortOffset + MAC_REG_SLOT, pDevice->bySlot);

		if (pDevice->bySlot == C_SLOT_SHORT) {

		if (pDevice->bySlot == C_SLOT_SHORT)

			pDevice->bShortSlotTime = true;

		} else {

		else

			pDevice->bShortSlotTime = false;

		}



		BBvSetShortSlotTime(pDevice);

	}

	if (pDevice->byCWMaxMin != byCWMaxMin) {

		pDevice->byCWMaxMin = byCWMaxMin;

		VNSvOutPortB(pDevice->PortOffset + MAC_REG_CWMAXMIN0, pDevice->byCWMaxMin);

	}

	if (VNTWIFIbIsShortPreamble(wCapInfo)) {

	if (VNTWIFIbIsShortPreamble(wCapInfo))

		pDevice->byPreambleType = pDevice->byShortPreamble;

	} else {

	else

		pDevice->byPreambleType = 0;

	}



	s_vSetRSPINF(pDevice, ePHYType, pSupportRates, pExtSupportRates);

	pDevice->eCurrentPHYType = ePHYType;

	// set for NDIS OID_802_11SUPPORTED_RATES
@@ -629,9 +628,9 @@ bool CARDbSetBeaconPeriod(void *pDeviceHandler, unsigned short wBeaconInterval) 
	uLowRemain = uBeaconInterval - uLowRemain;



	// check if carry when add one beacon interval

	if ((~uLowNextTBTT) < uLowRemain) {

	if ((~uLowNextTBTT) < uLowRemain)

		HIDWORD(qwNextTBTT)++;

	}



	LODWORD(qwNextTBTT) = uLowNextTBTT + uLowRemain;



	// set HW beacon interval
@@ -687,16 +686,14 @@ bool CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType) 
	}

	// wait all TD0 complete

	if (pDevice->bStopTx0Pkt == true) {

		if (pDevice->iTDUsed[TYPE_TXDMA0] != 0) {

		if (pDevice->iTDUsed[TYPE_TXDMA0] != 0)

			return false;

	}

	}

	// wait all Data TD complete

	if (pDevice->bStopDataPkt == true) {

		if (pDevice->iTDUsed[TYPE_AC0DMA] != 0) {

		if (pDevice->iTDUsed[TYPE_AC0DMA] != 0)

			return false;

	}

	}



	return true;

}
@@ -759,16 +756,16 @@ bool CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e 


	MACvWriteBSSIDAddress(pDevice->PortOffset, pbyBSSID);

	memcpy(pDevice->abyBSSID, pbyBSSID, WLAN_BSSID_LEN);

	if (eOPMode == OP_MODE_ADHOC) {

	if (eOPMode == OP_MODE_ADHOC)

		MACvRegBitsOn(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC);

	} else {

	else

		MACvRegBitsOff(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC);

	}

	if (eOPMode == OP_MODE_AP) {



	if (eOPMode == OP_MODE_AP)

		MACvRegBitsOn(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP);

	} else {

	else

		MACvRegBitsOff(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP);

	}



	if (eOPMode == OP_MODE_UNKNOWN) {

		MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);

		pDevice->bBSSIDFilter = false;
@@ -1011,31 +1008,31 @@ CARDbAdd_PMKID_Candidate( 
		memset(&pDevice->gsPMKIDCandidate, 0, sizeof(SPMKIDCandidateEvent));

	}



	for (ii = 0; ii < 6; ii++) {

	for (ii = 0; ii < 6; ii++)

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02X ", *(pbyBSSID + ii));

	}



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "\n");



	// Update Old Candidate

	for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {

		pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];

		if (!memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) {

			if (bRSNCapExist && (wRSNCap & BIT0)) {

			if (bRSNCapExist && (wRSNCap & BIT0))

				pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;

			} else {

			else

				pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);

			}



			return true;

		}

	}



	// New Candidate

	pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[pDevice->gsPMKIDCandidate.NumCandidates];

	if (bRSNCapExist && (wRSNCap & BIT0)) {

	if (bRSNCapExist && (wRSNCap & BIT0))

		pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;

	} else {

	else

		pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);

	}



	memcpy(pCandidateList->BSSID, pbyBSSID, ETH_ALEN);

	pDevice->gsPMKIDCandidate.NumCandidates++;

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
@@ -1116,16 +1113,16 @@ CARDbStartMeasure( 
				// start immediately by setting start TSF == current TSF + 2 TU

				LODWORD(qwStartTSF) = LODWORD(qwCurrTSF) + 2048;

				HIDWORD(qwStartTSF) = HIDWORD(qwCurrTSF);

				if (LODWORD(qwCurrTSF) > LODWORD(qwStartTSF)) {

				if (LODWORD(qwCurrTSF) > LODWORD(qwStartTSF))

					HIDWORD(qwStartTSF)++;

				}



				bExpired = false;

				break;

			} else {

				// start at setting start TSF - 1TU(for channel switching)

				if (LODWORD(qwStartTSF) < 1024) {

				if (LODWORD(qwStartTSF) < 1024)

					HIDWORD(qwStartTSF)--;

				}



				LODWORD(qwStartTSF) -= 1024;

			}
@@ -1214,9 +1211,9 @@ CARDbChannelSwitch( 
	pDevice->byChannelSwitchCount = byCount;

	pDevice->byNewChannel = byNewChannel;

	pDevice->bChannelSwitch = true;

	if (byMode == 1) {

	if (byMode == 1)

		bResult = CARDbStopTxPacket(pDevice, PKT_TYPE_802_11_ALL);

	}



	return bResult;

}
@@ -1249,9 +1246,9 @@ CARDbSetQuiet( 


	if (bResetQuiet) {

		MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN));

		for (ii = 0; ii < MAX_QUIET_COUNT; ii++) {

		for (ii = 0; ii < MAX_QUIET_COUNT; ii++)

			pDevice->sQuiet[ii].bEnable = false;

		}



		pDevice->uQuietEnqueue = 0;

		pDevice->bEnableFirstQuiet = false;

		pDevice->bQuietEnable = false;
@@ -1266,10 +1263,9 @@ CARDbSetQuiet( 
		pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime += wQuietOffset;

		pDevice->uQuietEnqueue++;

		pDevice->uQuietEnqueue %= MAX_QUIET_COUNT;

		if (pDevice->byQuietStartCount < byQuietCount) {

		if (pDevice->byQuietStartCount < byQuietCount)

			pDevice->byQuietStartCount = byQuietCount;

	}

	}

	return true;

}
@@ -1364,9 +1360,9 @@ CARDbStartQuiet( 
		if (pDevice->dwCurrentQuietEndTime > 0x80010000) {

			// decreament all time to avoid wrap around

			for (ii = 0; ii < MAX_QUIET_COUNT; ii++) {

				if (pDevice->sQuiet[ii].bEnable == true) {

				if (pDevice->sQuiet[ii].bEnable == true)

					pDevice->sQuiet[ii].dwStartTime -= 0x80000000;

				}



			}

			pDevice->dwCurrentQuietEndTime -= 0x80000000;

		}
@@ -1398,13 +1394,13 @@ CARDvSetPowerConstraint( 
	PSDevice    pDevice = (PSDevice) pDeviceHandler;



	if (byChannel > CB_MAX_CHANNEL_24G) {

		if (pDevice->bCountryInfo5G == true) {

		if (pDevice->bCountryInfo5G == true)

			pDevice->abyLocalPwr[byChannel] = pDevice->abyRegPwr[byChannel] - byPower;

		}



	} else {

		if (pDevice->bCountryInfo24G == true) {

		if (pDevice->bCountryInfo24G == true)

			pDevice->abyLocalPwr[byChannel] = pDevice->abyRegPwr[byChannel] - byPower;

		}



	}

}
@@ -1583,9 +1579,9 @@ unsigned short CARDwGetCCKControlRate(void *pDeviceHandler, unsigned short wRate 
	unsigned int ui = (unsigned int) wRateIdx;



	while (ui > RATE_1M) {

		if (pDevice->wBasicRate & ((unsigned short)1 << ui)) {

		if (pDevice->wBasicRate & ((unsigned short)1 << ui))

			return (unsigned short)ui;

		}



		ui--;

	}

	return (unsigned short)RATE_1M;
@@ -1785,11 +1781,11 @@ void vUpdateIFS(void *pDeviceHandler) 
		byMaxMin = 5;

	} else { // PK_TYPE_11GA & PK_TYPE_11GB

		pDevice->uSIFS = C_SIFS_BG;

		if (pDevice->bShortSlotTime) {

		if (pDevice->bShortSlotTime)

			pDevice->uSlot = C_SLOT_SHORT;

		} else {

		else

			pDevice->uSlot = C_SLOT_LONG;

		}



		pDevice->uDIFS = C_SIFS_BG + 2*pDevice->uSlot;

		if (pDevice->wBasicRate & 0x0150) { //0000 0001 0101 0000,24M,12M,6M

			pDevice->uCwMin = C_CWMIN_A;
@@ -1871,14 +1867,13 @@ unsigned char CARDbyGetPktType(void *pDeviceHandler) 
{

	PSDevice pDevice = (PSDevice) pDeviceHandler;



	if (pDevice->byBBType == BB_TYPE_11A || pDevice->byBBType == BB_TYPE_11B) {

	if (pDevice->byBBType == BB_TYPE_11A || pDevice->byBBType == BB_TYPE_11B)

		return (unsigned char)pDevice->byBBType;

	} else if (CARDbIsOFDMinBasicRate((void *)pDevice)) {

	else if (CARDbIsOFDMinBasicRate((void *)pDevice))

		return PK_TYPE_11GA;

	} else {

	else

		return PK_TYPE_11GB;

}

}



/*

 * Description: Set NIC Loopback mode
@@ -1956,9 +1951,9 @@ QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2) 
	LODWORD(qwTSFOffset) = 0;

	wRxBcnTSFOffst = cwRXBCNTSFOff[byRxRate%MAX_RATE];

	(qwTSF2).u.dwLowDword += (unsigned long)(wRxBcnTSFOffst);

	if ((qwTSF2).u.dwLowDword < (unsigned long)(wRxBcnTSFOffst)) {

	if ((qwTSF2).u.dwLowDword < (unsigned long)(wRxBcnTSFOffst))

		(qwTSF2).u.dwHighDword++;

	}



	LODWORD(qwTSFOffset) = LODWORD(qwTSF1) - LODWORD(qwTSF2);

	if (LODWORD(qwTSF1) < LODWORD(qwTSF2)) {

		// if borrow needed

drivers/staging/vt6655/channel.c

+35 −42
Original line number Diff line number Diff line
@@ -420,9 +420,8 @@ void init_channel_table(void *pDeviceHandler) 
	bool bMultiBand = false;

	unsigned int ii;



	for (ii = 1; ii <= CARD_MAX_CHANNEL_TBL; ii++) {

	for (ii = 1; ii <= CARD_MAX_CHANNEL_TBL; ii++)

		sChannelTbl[ii].bValid = false;

	}



	switch (pDevice->byRFType) {

	case RF_RFMD2959:
@@ -525,13 +524,11 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) 
	PSDevice pDevice = (PSDevice) pDeviceHandler;

	bool bResult = true;



	if (pDevice->byCurrentCh == uConnectionChannel) {

	if (pDevice->byCurrentCh == uConnectionChannel)

		return bResult;

	}



	if (!sChannelTbl[uConnectionChannel].bValid) {

	if (!sChannelTbl[uConnectionChannel].bValid)

		return false;

	}



	if ((uConnectionChannel > CB_MAX_CHANNEL_24G) &&

	    (pDevice->eCurrentPHYType != PHY_TYPE_11A)) {
@@ -546,9 +543,8 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) 
	//{{ RobertYu: 20041202

	//// TX_PE will reserve 3 us for MAX2829 A mode only, it is for better TX throughput



	if (pDevice->byRFType == RF_AIROHA7230) {

	if (pDevice->byRFType == RF_AIROHA7230)

		RFbAL7230SelectChannelPostProcess(pDevice->PortOffset, pDevice->byCurrentCh, (unsigned char)uConnectionChannel);

	}

	//}} RobertYu



	pDevice->byCurrentCh = (unsigned char)uConnectionChannel;
@@ -570,11 +566,10 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) 
		MACvSelectPage0(pDevice->PortOffset);

	}



	if (pDevice->eCurrentPHYType == PHY_TYPE_11B) {

	if (pDevice->eCurrentPHYType == PHY_TYPE_11B)

		RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);

	} else {

	else

		RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);

	}



	return bResult;

}
@@ -601,15 +596,15 @@ void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE) 


	if (ePHYType == PHY_TYPE_11A) {

		pDevice->bCountryInfo5G = true;

		for (ii = CB_MAX_CHANNEL_24G + 1; ii <= CARD_MAX_CHANNEL_TBL; ii++) {

		for (ii = CB_MAX_CHANNEL_24G + 1; ii <= CARD_MAX_CHANNEL_TBL; ii++)

			sChannelTbl[ii].bValid = false;

		}



		step = 4;

	} else {

		pDevice->bCountryInfo24G = true;

		for (ii = 1; ii <= CB_MAX_CHANNEL_24G; ii++) {

		for (ii = 1; ii <= CB_MAX_CHANNEL_24G; ii++)

			sChannelTbl[ii].bValid = false;

		}



		step = 1;

	}

	pDevice->abyCountryCode[0] = pIE_Country->abyCountryString[0];
@@ -652,19 +647,19 @@ unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs) 
	byCount = 0;

	if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[28] == true) {

		for (ii = 28; ii < 36; ii += 2) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true)

				byCount++;

		}

		}



		*pbyChTupple++ = 34;

		*pbyChTupple++ = byCount;

		byLen += 2;

	} else if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[29] == true) {

		for (ii = 29; ii < 36; ii += 2) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true)

				byCount++;

		}

		}



		*pbyChTupple++ = 36;

		*pbyChTupple++ = byCount;

		byLen += 2;
@@ -673,10 +668,10 @@ unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs) 
	byCount = 0;

	if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[36] == true) {

		for (ii = 36; ii < 40; ii++) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true)

				byCount++;

		}

		}



		*pbyChTupple++ = 52;

		*pbyChTupple++ = byCount;

		byLen += 2;
@@ -685,19 +680,19 @@ unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs) 
	byCount = 0;

	if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[40] == true) {

		for (ii = 40; ii < 51; ii++) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true)

				byCount++;

		}

		}



		*pbyChTupple++ = 100;

		*pbyChTupple++ = byCount;

		byLen += 2;

	} else if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[51] == true) {

		for (ii = 51; ii < 56; ii++) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true) {

			if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] == true)

				byCount++;

		}

		}



		*pbyChTupple++ = 149;

		*pbyChTupple++ = byCount;

		byLen += 2;
@@ -764,16 +759,15 @@ unsigned char auto_channel_select(void *pDeviceHandler, CARD_PHY_TYPE ePHYType) 
	if (ePHYType == PHY_TYPE_11A) {

		for (ii = CB_MAX_CHANNEL_24G + 1; ii <= CB_MAX_CHANNEL; ii++) {

			if (sChannelTbl[ii].bValid) {

				if (byOptionChannel == 0) {

				if (byOptionChannel == 0)

					byOptionChannel = (unsigned char) ii;

				}

				if (sChannelTbl[ii].byMAP == 0) {



				if (sChannelTbl[ii].byMAP == 0)

					return (unsigned char) ii;

				} else if (!(sChannelTbl[ii].byMAP & 0x08)) {

				else if (!(sChannelTbl[ii].byMAP & 0x08))

					byOptionChannel = (unsigned char) ii;

			}

		}

		}

	} else {

		byOptionChannel = 0;

		for (ii = 1; ii <= CB_MAX_CHANNEL_24G; ii++) {
@@ -781,28 +775,27 @@ unsigned char auto_channel_select(void *pDeviceHandler, CARD_PHY_TYPE ePHYType) 
				if (sChannelTbl[ii].byMAP == 0) {

					aiWeight[ii] += 100;

				} else if (sChannelTbl[ii].byMAP & 0x01) {

					if (ii > 3) {

					if (ii > 3)

						aiWeight[ii - 3] -= 10;

					}

					if (ii > 2) {



					if (ii > 2)

						aiWeight[ii - 2] -= 20;

					}

					if (ii > 1) {



					if (ii > 1)

						aiWeight[ii - 1] -= 40;

					}



					aiWeight[ii] -= 80;

					if (ii < CB_MAX_CHANNEL_24G) {

					if (ii < CB_MAX_CHANNEL_24G)

						aiWeight[ii + 1] -= 40;

					}

					if (ii < (CB_MAX_CHANNEL_24G - 1)) {



					if (ii < (CB_MAX_CHANNEL_24G - 1))

						aiWeight[ii+2] -= 20;

					}

					if (ii < (CB_MAX_CHANNEL_24G - 2)) {



					if (ii < (CB_MAX_CHANNEL_24G - 2))

						aiWeight[ii+3] -= 10;

				}

			}

		}

		}

		for (ii = 1; ii <= CB_MAX_CHANNEL_24G; ii++) {

			if (sChannelTbl[ii].bValid &&

			    (aiWeight[ii] > aiWeight[byOptionChannel])) {

drivers/staging/vt6655/datarate.c

+6 −8
Original line number Diff line number Diff line
@@ -253,9 +253,8 @@ RATEvParseMaxRate( 
		}

	}



	if ((pDevice->byPacketType == PK_TYPE_11GB) && CARDbIsOFDMinBasicRate((void *)pDevice)) {

	if ((pDevice->byPacketType == PK_TYPE_11GB) && CARDbIsOFDMinBasicRate((void *)pDevice))

		pDevice->byPacketType = PK_TYPE_11GA;

	}



	*pbyTopCCKRate = pDevice->byTopCCKBasicRate;

	*pbyTopOFDMRate = pDevice->byTopOFDMBasicRate;
@@ -319,15 +318,14 @@ RATEvTxRateFallBack( 
		return;

	}



	if (psNodeDBTable->uTimeCount >= AUTORATE_TIMEOUT) {

	if (psNodeDBTable->uTimeCount >= AUTORATE_TIMEOUT)

		psNodeDBTable->uTimeCount = 0;

	}



	for (ii = 0; ii < MAX_RATE; ii++) {

		if (psNodeDBTable->wSuppRate & (0x0001<<ii)) {

			if (bAutoRate[ii]) {

			if (bAutoRate[ii])

				wIdxUpRate = (unsigned short) ii;

			}



		} else {

			bAutoRate[ii] = false;

		}
@@ -337,9 +335,9 @@ RATEvTxRateFallBack( 
		if ((psNodeDBTable->uTxOk[ii] != 0) ||

		    (psNodeDBTable->uTxFail[ii] != 0)) {

			dwThroughputTbl[ii] *= psNodeDBTable->uTxOk[ii];

			if (ii < RATE_11M) {

			if (ii < RATE_11M)

				psNodeDBTable->uTxFail[ii] *= 4;

			}



			dwThroughputTbl[ii] /= (psNodeDBTable->uTxOk[ii] + psNodeDBTable->uTxFail[ii]);

		}

	}