Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cade5ac authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: Remove always true bUpdateBBVGA 



Remove true if statements.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c729b0a4

drivers/staging/vt6656/bssdb.c

+12 −17
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice, 
		}

	}



	if (pDevice->bUpdateBBVGA) {

	/* Monitor if RSSI is too strong. */

	pBSSList->byRSSIStatCnt = 0;

	RFvRSSITodBm(pDevice, (u8) (pRxPacket->uRSSI),
@@ -464,7 +463,6 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice, 
	pBSSList->ldBmAverRange = pBSSList->ldBmMAX;

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

		pBSSList->ldBmAverage[ii] = 0;

	}



	pBSSList->uIELength = uIELength;

	if (pBSSList->uIELength > WLAN_BEACON_FR_MAXLEN)
@@ -998,10 +996,8 @@ void BSSvSecondCallBack(struct work_struct *work) 


		if (pMgmt->sNodeDBTable[0].bActive) { /* Assoc with BSS */



			if (pDevice->bUpdateBBVGA) {

			s_vCheckSensitivity(pDevice);

			s_vCheckPreEDThreshold(pDevice);

			}



			if (pMgmt->sNodeDBTable[0].uInActiveCount >=

							(LOST_BEACON_COUNT/2) &&
@@ -1118,10 +1114,9 @@ void BSSvSecondCallBack(struct work_struct *work) 
		}

		if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {



			if (pDevice->bUpdateBBVGA) {

			s_vCheckSensitivity(pDevice);

			s_vCheckPreEDThreshold(pDevice);

			}



			if (pMgmt->sNodeDBTable[0].uInActiveCount >=

						ADHOC_LOST_BEACON_COUNT) {

				DBG_PRT(MSG_LEVEL_NOTICE,

drivers/staging/vt6656/device.h

+0 −1
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ struct vnt_private { 
	int bRxMICFail;



	/* For Update BaseBand VGA Gain Offset */

	int bUpdateBBVGA;

	u32 uBBVGADiffCount;

	u8 byBBVGANew;

	u8 byBBVGACurrent;

drivers/staging/vt6656/main_usb.c

+3 −6
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ device_set_options(struct vnt_private *pDevice) { 
    pDevice->byBBType = BBP_TYPE_DEF;

    pDevice->byPacketType = pDevice->byBBType;

    pDevice->byAutoFBCtrl = AUTO_FB_0;

    pDevice->bUpdateBBVGA = true;

    pDevice->byPreambleType = 0;

    pDevice->bExistSWNetAddr = false;

    /* pDevice->bDiversityRegCtlON = true; */
@@ -566,12 +565,10 @@ static int device_init_registers(struct vnt_private *pDevice) 
	BBvSetShortSlotTime(pDevice);

	CARDvSetBSSMode(pDevice);



	if (pDevice->bUpdateBBVGA) {

	pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];

	pDevice->byBBVGANew = pDevice->byBBVGACurrent;



	BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]);

	}



	pDevice->byRadioCtl = pDevice->abyEEPROM[EEP_OFS_RADIOCTL];

	pDevice->bHWRadioOff = false;

drivers/staging/vt6656/wcmd.c

+7 −10
Original line number Diff line number Diff line
@@ -344,11 +344,10 @@ void vRunCommand(struct work_struct *work) 
			CARDbSetMediaChannel(pDevice, pMgmt->uScanChannel);

			// Set Baseband to be more sensitive.



			if (pDevice->bUpdateBBVGA) {

			BBvSetShortSlotTime(pDevice);

			BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]);

			BBvUpdatePreEDThreshold(pDevice, true);

			}



			pMgmt->uScanChannel++;



			while (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel) &&
@@ -381,11 +380,9 @@ void vRunCommand(struct work_struct *work) 
			CARDvSetBSSMode(pDevice);

		}



		if (pDevice->bUpdateBBVGA) {

		BBvSetShortSlotTime(pDevice);

		BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);

		BBvUpdatePreEDThreshold(pDevice, false);

		}



		// Set channel back

		vAdHocBeaconRestart(pDevice);

drivers/staging/vt6656/wmgr.c

+1 −2
Original line number Diff line number Diff line
@@ -2653,8 +2653,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 
    pMgmt->uCurrChannel = pCurr->uChannel;

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Channel [%d]\n", pCurr->uChannel);



    if ((pDevice->bUpdateBBVGA) &&

        (pDevice->byBBVGACurrent != pDevice->abyBBVGA[0])) {

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

        pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];

        BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);

        BBvSetShortSlotTime(pDevice);