Commit 5e0cc8a2 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Convert to kernel brace style 



Move braces around to be more kernel like.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2046f93

drivers/staging/vt6655/80211mgr.c

+1 −2
Original line number Diff line number Diff line
@@ -494,8 +494,7 @@ vMgrDecodeAssocResponse( 
	    (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {

		pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);

	}

	else {

	} else {

		pFrame->pExtSuppRates = NULL;

	}

	return;

drivers/staging/vt6655/aes_ccmp.c

+5 −11
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ void SubBytes(unsigned char *in, unsigned char *out) 
{

	int i;



	for (i = 0; i < 16; i++)

	{

	for (i = 0; i < 16; i++) {

		out[i] = sbox_table[in[i]];

	}

}
@@ -201,20 +200,15 @@ void AESv128(unsigned char *key, unsigned char *data, unsigned char *ciphertext) 
	for (i = 0; i < 16; i++)

		abyRoundKey[i] = key[i];



	for (round = 0; round < 11; round++)

	{

		if (round == 0)

		{

	for (round = 0; round < 11; round++) {

		if (round == 0) {

			xor_128(abyRoundKey, data, ciphertext);

			AddRoundKey(abyRoundKey, round);

		}

		else if (round == 10)

		{

		} else if (round == 10) {

			SubBytes(ciphertext, TmpdataA);

			ShiftRows(TmpdataA, TmpdataB);

			xor_128(TmpdataB, abyRoundKey, ciphertext);

		}

		else // round 1 ~ 9

		} else // round 1 ~ 9

		{

			SubBytes(ciphertext, TmpdataA);

			ShiftRows(TmpdataA, TmpdataB);

drivers/staging/vt6655/baseband.c

+13 −26
Original line number Diff line number Diff line
@@ -1806,8 +1806,7 @@ BBuGetFrameTime( 
		}



		return (uPreamble + uFrameTime);

	}

	else {

	} else {

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

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

		if (cbFrameLength != uTmp) {
@@ -1905,8 +1904,7 @@ BBvCalculateParameter( 
	case RATE_6M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x9B; //1001 1011

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x8B; //1000 1011

		}

		break;
@@ -1914,8 +1912,7 @@ BBvCalculateParameter( 
	case RATE_9M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x9F; //1001 1111

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x8F; //1000 1111

		}

		break;
@@ -1923,8 +1920,7 @@ BBvCalculateParameter( 
	case RATE_12M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x9A; //1001 1010

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x8A; //1000 1010

		}

		break;
@@ -1932,8 +1928,7 @@ BBvCalculateParameter( 
	case RATE_18M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x9E; //1001 1110

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x8E; //1000 1110

		}

		break;
@@ -1941,8 +1936,7 @@ BBvCalculateParameter( 
	case RATE_24M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x99; //1001 1001

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x89; //1000 1001

		}

		break;
@@ -1950,8 +1944,7 @@ BBvCalculateParameter( 
	case RATE_36M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x9D; //1001 1101

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x8D; //1000 1101

		}

		break;
@@ -1959,8 +1952,7 @@ BBvCalculateParameter( 
	case RATE_48M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x98; //1001 1000

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x88; //1000 1000

		}

		break;
@@ -1968,8 +1960,7 @@ BBvCalculateParameter( 
	case RATE_54M:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x9C; //1001 1100

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x8C; //1000 1100

		}

		break;
@@ -1977,8 +1968,7 @@ BBvCalculateParameter( 
	default:

		if (byPacketType == PK_TYPE_11A) {//11a, 5GHZ

			*pbyPhySgn = 0x9C; //1001 1100

		}

		else {//11g, 2.4GHZ

		} else {//11g, 2.4GHZ

			*pbyPhySgn = 0x8C; //1000 1100

		}

		break;
@@ -1989,8 +1979,7 @@ BBvCalculateParameter( 
		if (bExtBit)

			*pbyPhySrv = *pbyPhySrv | 0x80;

		*pwPhyLen = (unsigned short)cbUsCount;

	}

	else {

	} else {

		*pbyPhySrv = 0x00;

		*pwPhyLen = (unsigned short)cbFrameLength;

	}
@@ -2362,8 +2351,7 @@ void BBvLoopbackOn(PSDevice pDevice) 
		BBbWriteEmbedded(dwIoBase, 0x9A, 0);   //CR154



		BBbWriteEmbedded(dwIoBase, 0x88, 0x02);//CR239

	}

	else { //OFDM

	} else { //OFDM

		// Enable internal digital loopback:CR154 |= 0000 0001

		BBbReadEmbedded(dwIoBase, 0x9A, &byData);//CR154

		BBbWriteEmbedded(dwIoBase, 0x9A, (unsigned char)(byData | 0x01));//CR154
@@ -2408,8 +2396,7 @@ void BBvLoopbackOff(PSDevice pDevice) 
		// Set the CR33 Bit2 to disable internal Loopback.

		BBbReadEmbedded(dwIoBase, 0x21, &byData);//CR33

		BBbWriteEmbedded(dwIoBase, 0x21, (unsigned char)(byData & 0xFE));//CR33

	}

	else { // OFDM

	} else { // OFDM

		BBbReadEmbedded(dwIoBase, 0x9A, &byData);//CR154

		BBbWriteEmbedded(dwIoBase, 0x9A, (unsigned char)(byData & 0xFE));//CR154

	}

drivers/staging/vt6655/bssdb.c

+30 −45
Original line number Diff line number Diff line
@@ -810,8 +810,7 @@ BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex) 
				BigestCount = pMgmt->sNodeDBTable[ii].uInActiveCount;

				SelectIndex = ii;

			}

		}

		else {

		} else {

			break;

		}

	}
@@ -825,8 +824,7 @@ BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex) 
			while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue)) != NULL)

				dev_kfree_skb(skb);

		}

	}

	else {

	} else {

		*puNodeIndex = ii;

	}
@@ -1027,13 +1025,13 @@ BSSvSecondCallBack( 
	MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO);

	if (((!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->bHWRadioOff == false)) || ((pDevice->byGPIO & GPIO0_DATA) && (pDevice->bHWRadioOff == true))) && (cc == false)) {

		cc = true;

	}

	else if (cc == true) {

	} else if (cc == true) {



		if (pDevice->bHWRadioOff == true) {

			if (!(pDevice->byGPIO & GPIO0_DATA))

//||(!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV)))

			{ if (status == 1) goto start;

			{

				if (status == 1) goto start;

				status = 1;

				CARDbRadioPowerOff(pDevice);

				pMgmt->sNodeDBTable[0].bActive = false;
@@ -1045,14 +1043,16 @@ BSSvSecondCallBack( 
			}

			if (pDevice->byGPIO & GPIO0_DATA)

//||(!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV)))

			{if (status == 2) goto start;

			{

				if (status == 2) goto start;

				status = 2;

				CARDbRadioPowerOn(pDevice);

			} }

		else{

			}

		} else {

			if (pDevice->byGPIO & GPIO0_DATA)

//||(!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV)))

			{if (status == 3) goto start;

			{

				if (status == 3) goto start;

				status = 3;

				CARDbRadioPowerOff(pDevice);

				pMgmt->sNodeDBTable[0].bActive = false;
@@ -1064,10 +1064,12 @@ BSSvSecondCallBack( 
			}

			if (!(pDevice->byGPIO & GPIO0_DATA))

//||(!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV)))

			{if (status == 4) goto start;

			{

				if (status == 4) goto start;

				status = 4;

				CARDbRadioPowerOn(pDevice);

			} }

			}

		}

	}

start:

#endif
@@ -1075,8 +1077,7 @@ BSSvSecondCallBack( 


	if (pDevice->wUseProtectCntDown > 0) {

		pDevice->wUseProtectCntDown--;

	}

	else {

	} else {

		// disable protect mode

		pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));

	}
@@ -1096,8 +1097,7 @@ BSSvSecondCallBack( 
				wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);

			}

#endif

		}

		else if (pDevice->bLinkPass == true)

		} else if (pDevice->bLinkPass == true)

			pDevice->byReAssocCount = 0;

	}
@@ -1154,8 +1154,7 @@ BSSvSecondCallBack( 
				if (ii > 0) {

					// ii = 0 for multicast node (AP & Adhoc)

					RATEvTxRateFallBack((void *)pDevice, &(pMgmt->sNodeDBTable[ii]));

				}

				else {

				} else {

					// ii = 0 reserved for unicast AP node (Infra STA)

					if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)

#ifdef	PLICE_DEBUG
@@ -1193,8 +1192,7 @@ BSSvSecondCallBack( 
				MACvEnableProtectMD(pDevice->PortOffset);

				pDevice->bProtectMode = true;

			}

		}

		else {

		} else {

			if (pDevice->bProtectMode) {

				MACvDisableProtectMD(pDevice->PortOffset);

				pDevice->bProtectMode = false;
@@ -1208,8 +1206,7 @@ BSSvSecondCallBack( 
				BBvSetShortSlotTime(pDevice);

				vUpdateIFS((void *)pDevice);

			}

		}

		else {

		} else {

			if (!pDevice->bShortSlotTime) {

				pDevice->bShortSlotTime = true;

				BBvSetShortSlotTime(pDevice);
@@ -1224,8 +1221,7 @@ BSSvSecondCallBack( 
				MACvEnableBarkerPreambleMd(pDevice->PortOffset);

				pDevice->bBarkerPreambleMd = true;

			}

		}

		else {

		} else {

			if (pDevice->bBarkerPreambleMd) {

				MACvDisableBarkerPreambleMd(pDevice->PortOffset);

				pDevice->bBarkerPreambleMd = false;
@@ -1299,8 +1295,7 @@ BSSvSecondCallBack( 
				}

#endif

			}

		}

		else if (pItemSSID->len != 0) {

		} else if (pItemSSID->len != 0) {

			if (pDevice->uAutoReConnectTime < 10) {

				pDevice->uAutoReConnectTime++;

#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
@@ -1308,8 +1303,7 @@ BSSvSecondCallBack( 
				if (pDevice->bWPASuppWextEnabled == true)

					pDevice->uAutoReConnectTime = 0;

#endif

			}

			else {

			} else {

				//mike use old encryption status for wpa reauthen

				if (pDevice->bWPADEVUp)

					pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus;
@@ -1329,8 +1323,7 @@ BSSvSecondCallBack( 
		if ((pMgmt->eCurrState == WMAC_STATE_STARTED) && (pCurrSSID->len == 0)) {

			if (pDevice->uAutoReConnectTime < 10) {

				pDevice->uAutoReConnectTime++;

			}

			else {

			} else {

				DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scanning ...\n");

				pMgmt->eScanType = WMAC_SCAN_ACTIVE;

				bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL);
@@ -1456,15 +1449,12 @@ BSSvUpdateNodeTxCounter( 
					for (ii = 0; ii < byTxRetry; ii++)

						//for (ii=0;ii<txRetryTemp;ii++)

					{

						if (ii < 5)

						{

						if (ii < 5) {



//PLICE_DEBUG

							wFallBackRate = awHWRetry0[wRate-RATE_18M][ii];

							//wFallBackRate = awHWRetry0[wRate-RATE_12M][ii];

						}

						else

						{

						} else {

							wFallBackRate = awHWRetry0[wRate-RATE_18M][4];

							//wFallBackRate = awHWRetry0[wRate-RATE_12M][4];

						}
@@ -1677,21 +1667,16 @@ void s_uCalculateLinkQual( 
	TxOkRatio = (TxCnt < 6) ? 4000 : ((pDevice->scStatistic.TxNoRetryOkCount * 4000) / TxCnt);

	RxOkRatio = (RxCnt < 6) ? 2000 : ((pDevice->scStatistic.RxOkCnt * 2000) / RxCnt);

//decide link quality

	if (pDevice->bLinkPass != true)

	{

	if (pDevice->bLinkPass != true) {

		pDevice->scStatistic.LinkQuality = 0;

		pDevice->scStatistic.SignalStren = 0;

	}

	else

	{

	} else {

		RFvRSSITodBm(pDevice, (unsigned char)(pDevice->uCurrRSSI), &ldBm);

		if (-ldBm < 50)  {

			RssiRatio = 4000;

		}

		else if (-ldBm > 90) {

		} else if (-ldBm > 90) {

			RssiRatio = 0;

		}

		else {

		} else {

			RssiRatio = (40-(-ldBm-50))*4000/40;

		}

		pDevice->scStatistic.SignalStren = RssiRatio/40;

drivers/staging/vt6655/card.c

+16 −32
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x9B;

			*pbyRsvTime = 44;

		}

		else {

		} else {

			*pbyTxRate = 0x8B;

			*pbyRsvTime = 50;

		}
@@ -149,8 +148,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x9F;

			*pbyRsvTime = 36;

		}

		else {

		} else {

			*pbyTxRate = 0x8F;

			*pbyRsvTime = 42;

		}
@@ -160,8 +158,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x9A;

			*pbyRsvTime = 32;

		}

		else {

		} else {

			*pbyTxRate = 0x8A;

			*pbyRsvTime = 38;

		}
@@ -171,8 +168,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x9E;

			*pbyRsvTime = 28;

		}

		else {

		} else {

			*pbyTxRate = 0x8E;

			*pbyRsvTime = 34;

		}
@@ -182,8 +178,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x9D;

			*pbyRsvTime = 24;

		}

		else {

		} else {

			*pbyTxRate = 0x8D;

			*pbyRsvTime = 30;

		}
@@ -193,8 +188,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x98;

			*pbyRsvTime = 24;

		}

		else {

		} else {

			*pbyTxRate = 0x88;

			*pbyRsvTime = 30;

		}
@@ -204,8 +198,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x9C;

			*pbyRsvTime = 24;

		}

		else {

		} else {

			*pbyTxRate = 0x8C;

			*pbyRsvTime = 30;

		}
@@ -216,8 +209,7 @@ s_vCalculateOFDMRParameter( 
		if (ePHYType == PHY_TYPE_11A) {//5GHZ

			*pbyTxRate = 0x99;

			*pbyRsvTime = 28;

		}

		else {

		} else {

			*pbyTxRate = 0x89;

			*pbyRsvTime = 34;

		}
@@ -369,8 +361,7 @@ s_vSetRSPINF(PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, v 
 *

 */

/*

  bool CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength)

  {

  bool CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength) {

  PSDevice    pDevice = (PSDevice) pDeviceHandler;

  if (ePktType == PKT_TYPE_802_11_MNG) {

  return TXbTD0Send(pDevice, pPacket, uLength);
@@ -1005,8 +996,7 @@ bool CARDbRadioPowerOn(void *pDeviceHandler) 
		if (pDevice->bRadioControlOff == true) printk("chester bRadioControlOff\n");

		return false; }



	if (pDevice->bRadioOff == false)

	{

	if (pDevice->bRadioOff == false) {

		printk("chester pbRadioOff\n");

		return true; }
@@ -1865,15 +1855,13 @@ void vUpdateIFS(void *pDeviceHandler) 
		pDevice->uDIFS = C_SIFS_A + 2*C_SLOT_SHORT;

		pDevice->uCwMin = C_CWMIN_A;

		byMaxMin = 4;

	}

	else if (pDevice->byPacketType == PK_TYPE_11B) {//0000 0001 0000 0000,11b

	} else if (pDevice->byPacketType == PK_TYPE_11B) {//0000 0001 0000 0000,11b

		pDevice->uSlot = C_SLOT_LONG;

		pDevice->uSIFS = C_SIFS_BG;

		pDevice->uDIFS = C_SIFS_BG + 2*C_SLOT_LONG;

		pDevice->uCwMin = C_CWMIN_B;

		byMaxMin = 5;

	}

	else { // PK_TYPE_11GA & PK_TYPE_11GB

	} else { // PK_TYPE_11GA & PK_TYPE_11GB

		pDevice->uSIFS = C_SIFS_BG;

		if (pDevice->bShortSlotTime) {

			pDevice->uSlot = C_SLOT_SHORT;
@@ -1884,8 +1872,7 @@ void vUpdateIFS(void *pDeviceHandler) 
		if (pDevice->wBasicRate & 0x0150) { //0000 0001 0101 0000,24M,12M,6M

			pDevice->uCwMin = C_CWMIN_A;

			byMaxMin = 4;

		}

		else {

		} else {

			pDevice->uCwMin = C_CWMIN_B;

			byMaxMin = 5;

		}
@@ -1978,11 +1965,9 @@ unsigned char CARDbyGetPktType(void *pDeviceHandler) 


	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;

	}

}
@@ -2072,8 +2057,7 @@ QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2) 
	if (LODWORD(qwTSF1) < LODWORD(qwTSF2)) {

		// if borrow needed

		HIDWORD(qwTSFOffset) = HIDWORD(qwTSF1) - HIDWORD(qwTSF2) - 1;

	}

	else {

	} else {

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

	};

	return (qwTSFOffset);