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

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

staging: vt6656: Remove dead variable bCCK. 



bCCK is always true remove all false conditions and
local variable.

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

drivers/staging/vt6656/baseband.c

+0 −6
Original line number Diff line number Diff line
@@ -737,7 +737,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength, 
	u32 cbTmp;

	int bExtBit;

	u8 byPreambleType = pDevice->byPreambleType;

	int bCCK = pDevice->bCCK;



    cbBitCount = cbFrameLength * 8;

    bExtBit = false;
@@ -757,8 +756,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength, 
        break;



    case RATE_5M :

        if (bCCK == false)

            cbBitCount ++;

        cbUsCount = (cbBitCount * 10) / 55;

        cbTmp = (cbUsCount * 55) / 10;

        if (cbTmp != cbBitCount)
@@ -770,9 +767,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength, 
        break;



    case RATE_11M :



        if (bCCK == false)

            cbBitCount ++;

        cbUsCount = cbBitCount / 11;

        cbTmp = cbUsCount * 11;

        if (cbTmp != cbBitCount) {

drivers/staging/vt6656/device.h

+0 −1
Original line number Diff line number Diff line
@@ -581,7 +581,6 @@ struct vnt_private { 


	u32 dwMaxReceiveLifetime;  /* dot11MaxReceiveLifetime */



	int bCCK;

	int bEncryptionEnable;

	int bShortSlotTime;

	int bProtectMode;

drivers/staging/vt6656/main_usb.c

+0 −2
Original line number Diff line number Diff line
@@ -368,8 +368,6 @@ static int device_init_registers(struct vnt_private *pDevice) 


	/* do MACbSoftwareReset in MACvInitialize */



	/* force CCK */

	pDevice->bCCK = true;

	pDevice->bProtectMode = false;

	/* only used in 11g type, sync with ERP IE */

	pDevice->bNonERPPresent = false;

drivers/staging/vt6656/wmgr.c

+0 −1
Original line number Diff line number Diff line
@@ -2571,7 +2571,6 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, 
    }



    // Init the BSS informations

    pDevice->bCCK = true;

    pDevice->bProtectMode = false;

    MACvDisableProtectMD(pDevice);

    pDevice->bBarkerPreambleMd = false;