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

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

staging: vt6656: Remove always 0 variable dwDiagRefCount 



Remove > 0 code.

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

drivers/staging/vt6656/channel.c

+1 −2
Original line number Diff line number Diff line
@@ -423,8 +423,7 @@ void CHvInitChannelTable(struct vnt_private *pDevice) 
            break;

    }



    if ((pDevice->dwDiagRefCount != 0) ||

        (pDevice->b11hEable == true)) {

    if (pDevice->b11hEable == true) {

        if (bMultiBand == true) {

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

			sChannelTbl[ii+1].bValid = true;

drivers/staging/vt6656/device.h

+0 −1
Original line number Diff line number Diff line
@@ -697,7 +697,6 @@ struct vnt_private { 
	u8 byBBPreEDIndex;



	int bRadioCmd;

	u32 dwDiagRefCount;



	/* For FOE Tuning */

	u8  byFOETuning;

drivers/staging/vt6656/rf.c

+0 −3
Original line number Diff line number Diff line
@@ -740,9 +740,6 @@ int RFbSetPower(struct vnt_private *priv, u32 rate, u32 channel) 
	int ret = true;

	u8 power = priv->byCCKPwr;



	if (priv->dwDiagRefCount)

		return true;



	if (channel == 0)

		return -EINVAL;

drivers/staging/vt6656/rxtx.c

+20 −36
Original line number Diff line number Diff line
@@ -978,26 +978,17 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
			bSoftWEP = true; /* WEP 256 */

	}



    // Get pkt type

    if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN) {

        if (pDevice->dwDiagRefCount == 0) {

	/* Get pkt type */

	if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN)

		cb802_1_H_len = 8;

        } else {

            cb802_1_H_len = 2;

        }

    } else {

	else

		cb802_1_H_len = 0;

    }



    cbFrameBodySize = uSkbPacketLen - ETH_HLEN + cb802_1_H_len;



    //Set packet type

    pTxBufHead->wFIFOCtl |= (u16)(byPktType<<8);



    if (pDevice->dwDiagRefCount != 0) {

        bNeedACK = false;

        pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK);

    } else { //if (pDevice->dwDiagRefCount != 0) {

	if ((pDevice->eOPMode == OP_MODE_ADHOC) ||

			(pDevice->eOPMode == OP_MODE_AP)) {

		if (is_multicast_ether_addr(psEthHeader->h_dest)) {
@@ -1008,13 +999,11 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
			bNeedACK = true;

			pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;

		}

        }

        else {

            // MSDUs in Infra mode always need ACK

	} else {

		/* MSDUs in Infra mode always need ACK */

		bNeedACK = true;

		pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;

	}

    } //if (pDevice->dwDiagRefCount != 0) {



    pTxBufHead->wTimeStamp = DEFAULT_MSDU_LIFETIME_RES_64us;
@@ -1183,23 +1172,18 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
        }

    }



    // 802.1H

	/* 802.1H */

	if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN) {

	if (pDevice->dwDiagRefCount == 0) {

		if ((psEthHeader->h_proto == cpu_to_be16(ETH_P_IPX)) ||

		    (psEthHeader->h_proto == cpu_to_le16(0xF380))) {

			(psEthHeader->h_proto == cpu_to_le16(0xF380)))

			memcpy((u8 *) (pbyPayloadHead),

					abySNAP_Bridgetunnel, 6);

            } else {

		else

			memcpy((u8 *) (pbyPayloadHead), &abySNAP_RFC1042[0], 6);

            }

            pbyType = (u8 *) (pbyPayloadHead + 6);

            memcpy(pbyType, &(psEthHeader->h_proto), sizeof(u16));

        } else {

            memcpy((u8 *) (pbyPayloadHead), &(psEthHeader->h_proto), sizeof(u16));



        }

		pbyType = (u8 *) (pbyPayloadHead + 6);



		memcpy(pbyType, &(psEthHeader->h_proto), sizeof(u16));

	}



    if (pPacket != NULL) {

drivers/staging/vt6656/wcmd.c

+0 −2
Original line number Diff line number Diff line
@@ -283,8 +283,6 @@ void vRunCommand(struct work_struct *work) 
	if (pDevice->Flags & fMP_DISCONNECTED)

		return;



	if (pDevice->dwDiagRefCount != 0)

		return;

	if (pDevice->bCmdRunning != true)

		return;