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

staging: vt6656: rxtx.c s:_uGetDataDuration simplify structure. 



A value is only returned when bNeedAck is true.

Only when byDurType == DATADUR_B is different.

Remove switch statement and simplify with if structure.

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

drivers/staging/vt6656/rxtx.c

+9 −41
Original line number Diff line number Diff line
@@ -389,46 +389,14 @@ static u32 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType, 
{

	u32 uAckTime = 0;



    switch (byDurType) {



    case DATADUR_B:    //DATADUR_B

            if (bNeedAck) {

            	uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);

                return (pDevice->uSIFS + uAckTime);

            } else {

                return 0;

            }

        break;



    case DATADUR_A:    //DATADUR_A

	if (bNeedAck) {

            	uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);

                return (pDevice->uSIFS + uAckTime);

            } else {

                return 0;

            }

        break;



    case DATADUR_A_F0:    //DATADUR_A_F0

            if(bNeedAck){

            	uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);

                return (pDevice->uSIFS + uAckTime);

            } else {

                return 0;

            }

        break;



    case DATADUR_A_F1:    //DATADUR_A_F1

            if(bNeedAck){

            	uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);

                return (pDevice->uSIFS + uAckTime);

            } else {

                return 0;

            }

        break;



    default:

        break;

		if (byDurType == DATADUR_B)

			uAckTime = BBuGetFrameTime(pDevice->byPreambleType,

				byPktType, 14, pDevice->byTopCCKBasicRate);

		else

			uAckTime = BBuGetFrameTime(pDevice->byPreambleType,

				byPktType, 14, pDevice->byTopOFDMBasicRate);

		return pDevice->uSIFS + uAckTime;

	}



	return 0;