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

staging: vt6656: rxtx.c: s_uGetDataDuration Drop argument byDurType. 



When byDurType == DATADUR_B then byPktType == PK_TYPE_11B

Drop argument byDurType and filter on byPktType == PK_TYPE_11B.

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

drivers/staging/vt6656/rxtx.c

+17 −17
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, 
	void *pvRTS, u32 cbFrameLength, int bNeedAck, int bDisCRC,

	struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption);



static u16 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType,

static u16 s_uGetDataDuration(struct vnt_private *pDevice,

	u8 byPktType, int bNeedAck);



static u16 s_uGetRTSCTSDuration(struct vnt_private *pDevice,
@@ -383,13 +383,13 @@ static u32 s_uGetRTSCTSRsvTime(struct vnt_private *pDevice, 
}



//byFreqType 0: 5GHz, 1:2.4Ghz

static u16 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType,

static u16 s_uGetDataDuration(struct vnt_private *pDevice,

					u8 byPktType, int bNeedAck)

{

	u32 uAckTime = 0;



	if (bNeedAck) {

		if (byDurType == DATADUR_B)

		if (byPktType == PK_TYPE_11B)

			uAckTime = BBuGetFrameTime(pDevice->byPreambleType,

				byPktType, 14, pDevice->byTopCCKBasicRate);

		else
@@ -507,9 +507,9 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
		BBvCalculateParameter(pDevice, cbFrameLength,

			pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b);

                //Get Duration and TimeStamp

		pBuf->wDuration_a = s_uGetDataDuration(pDevice, DATADUR_A,

		pBuf->wDuration_a = s_uGetDataDuration(pDevice,

							byPktType, bNeedAck);

		pBuf->wDuration_b = s_uGetDataDuration(pDevice, DATADUR_B,

		pBuf->wDuration_b = s_uGetDataDuration(pDevice,

							PK_TYPE_11B, bNeedAck);



                pBuf->wTimeStampOff_a = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
@@ -525,14 +525,14 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
		BBvCalculateParameter(pDevice, cbFrameLength,

			pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b);

                //Get Duration and TimeStamp

		pBuf->wDuration_a = s_uGetDataDuration(pDevice, DATADUR_A,

		pBuf->wDuration_a = s_uGetDataDuration(pDevice,

							byPktType, bNeedAck);

		pBuf->wDuration_b = s_uGetDataDuration(pDevice, DATADUR_B,

		pBuf->wDuration_b = s_uGetDataDuration(pDevice,

							PK_TYPE_11B, bNeedAck);

		pBuf->wDuration_a_f0 = s_uGetDataDuration(pDevice,

					DATADUR_A_F0, byPktType, bNeedAck);

							byPktType, bNeedAck);

		pBuf->wDuration_a_f1 = s_uGetDataDuration(pDevice,

					DATADUR_A_F1, byPktType, bNeedAck);

							byPktType, bNeedAck);

                pBuf->wTimeStampOff_a = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];

                pBuf->wTimeStampOff_b = wTimeStampOff[pDevice->byPreambleType%2][pDevice->byTopCCKBasicRate%MAX_RATE];

                return (pBuf->wDuration_a);
@@ -546,12 +546,12 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
		BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate,

			byPktType, &pBuf->a);

            //Get Duration and TimeStampOff

		pBuf->wDuration = s_uGetDataDuration(pDevice, DATADUR_A,

		pBuf->wDuration = s_uGetDataDuration(pDevice,

					byPktType, bNeedAck);

		pBuf->wDuration_f0 = s_uGetDataDuration(pDevice,

				DATADUR_A_F0, byPktType, bNeedAck);

					byPktType, bNeedAck);

		pBuf->wDuration_f1 = s_uGetDataDuration(pDevice,

				DATADUR_A_F1, byPktType, bNeedAck);

							byPktType, bNeedAck);

                pBuf->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];

            return (pBuf->wDuration);

        } else {
@@ -561,7 +561,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
		BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate,

			byPktType, &pBuf->ab);

            //Get Duration and TimeStampOff

		pBuf->wDuration = s_uGetDataDuration(pDevice, DATADUR_A,

		pBuf->wDuration = s_uGetDataDuration(pDevice,

				byPktType, bNeedAck);

                pBuf->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
@@ -575,7 +575,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
		BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate,

			byPktType, &pBuf->ab);

            //Get Duration and TimeStampOff

		pBuf->wDuration = s_uGetDataDuration(pDevice, DATADUR_B,

		pBuf->wDuration = s_uGetDataDuration(pDevice,

				byPktType, bNeedAck);

                pBuf->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];
@@ -1806,7 +1806,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, 
							&pTxDataHead->ab);

        //Get Duration and TimeStampOff

	pTxDataHead->wDuration = s_uGetDataDuration(pDevice,

					DATADUR_A, PK_TYPE_11A, false);

						PK_TYPE_11A, false);

        pTxDataHead->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];

	cbHeaderSize = wTxBufSize + sizeof(struct vnt_tx_datahead_ab);

    } else {
@@ -1819,7 +1819,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, 
							&pTxDataHead->ab);

        //Get Duration and TimeStampOff

	pTxDataHead->wDuration = s_uGetDataDuration(pDevice,

					DATADUR_B, PK_TYPE_11B, false);

						PK_TYPE_11B, false);

        pTxDataHead->wTimeStampOff = wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE];

	cbHeaderSize = wTxBufSize + sizeof(struct vnt_tx_datahead_ab);

    }