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

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

staging: vt6656: dead code wCTSDuration. 



Always set to zero, so remove.

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

drivers/staging/vt6656/device.h

+0 −1
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ struct vnt_private { 
	u8 abyBSSID[ETH_ALEN];

	u8 abyDesireBSSID[ETH_ALEN];



	u16 wCTSDuration;       /* update while speed change */

	u16 wACKDuration;

	u16 wRTSTransmitLen;

	u8 byRTSServiceField;

drivers/staging/vt6656/main_usb.c

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ device_set_options(struct vnt_private *pDevice) { 
    pDevice->bUpdateBBVGA = true;

    pDevice->byFOETuning = 0;

    pDevice->byAutoPwrTunning = 0;

    pDevice->wCTSDuration = 0;

    pDevice->byPreambleType = 0;

    pDevice->bExistSWNetAddr = false;

    /* pDevice->bDiversityRegCtlON = true; */

drivers/staging/vt6656/rxtx.c

+0 −4
Original line number Diff line number Diff line
@@ -1005,15 +1005,12 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, 
            );

            pBuf->wTransmitLength_b = cpu_to_le16(wLen);

            pBuf->wDuration_ba = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data

            pBuf->wDuration_ba += pDevice->wCTSDuration;

            pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba);

            //Get CTSDuration_ba_f0

            pBuf->wCTSDuration_ba_f0 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //8:CTSDuration_ba_f0, 1:2.4G, 2,3:2.4G OFDM Data

            pBuf->wCTSDuration_ba_f0 += pDevice->wCTSDuration;

            pBuf->wCTSDuration_ba_f0 = cpu_to_le16(pBuf->wCTSDuration_ba_f0);

            //Get CTSDuration_ba_f1

            pBuf->wCTSDuration_ba_f1 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //9:CTSDuration_ba_f1, 1:2.4G, 2,3:2.4G OFDM Data

            pBuf->wCTSDuration_ba_f1 += pDevice->wCTSDuration;

            pBuf->wCTSDuration_ba_f1 = cpu_to_le16(pBuf->wCTSDuration_ba_f1);

            //Get CTS Frame body

            pBuf->Data.wDurationID = pBuf->wDuration_ba;
@@ -1031,7 +1028,6 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, 
            pBuf->wTransmitLength_b = cpu_to_le16(wLen);

            //Get CTSDuration_ba

            pBuf->wDuration_ba = cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data

            pBuf->wDuration_ba += pDevice->wCTSDuration;

            pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba);



            //Get CTS Frame body