Commit ae259831 authored by Matej Dujava's avatar Matej Dujava Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: return at the ond of case body 



This patch will unify exit point for s_uGetDataDuration function.

Signed-off-by: default avatarMatej Dujava <mdujava@kocurkovo.cz>
Link: https://lore.kernel.org/r/1588512552-12297-5-git-send-email-mdujava@kocurkovo.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3be1acff

drivers/staging/vt6655/rxtx.c

+6 −12
Original line number Diff line number Diff line
@@ -264,14 +264,12 @@ s_uGetDataDuration( 
		if ((uMACfragNum == 1) || bLastFrag) {

			if (!bNeedAck)

				return 0;

			return pDevice->uSIFS + uAckTime;

		} else {

			/* First Frag or Mid Frag */

			uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck);

		}



		return pDevice->uSIFS + uAckTime + uNextPktTime;

		}

		break;



	case DATADUR_A:    /* DATADUR_A */

		if (bNeedAck) {
@@ -283,15 +281,13 @@ s_uGetDataDuration( 
		if ((uMACfragNum == 1) || bLastFrag) {

			if (!bNeedAck)

				return 0;

			return pDevice->uSIFS + uAckTime;

		} else {

			/* First Frag or Mid Frag */

			uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len,

						       wRate, bNeedAck);

		}



		return pDevice->uSIFS + uAckTime + uNextPktTime;

		}

		break;



	case DATADUR_A_F0:    /* DATADUR_A_F0 */

	case DATADUR_A_F1:    /* DATADUR_A_F1 */
@@ -304,7 +300,6 @@ s_uGetDataDuration( 
		if ((uMACfragNum == 1) || bLastFrag) {

			if (!bNeedAck)

				return 0;

			return pDevice->uSIFS + uAckTime;

		} else {

			/* First Frag or Mid Frag */

			if (wRate < RATE_18M)
@@ -323,10 +318,9 @@ s_uGetDataDuration( 
							       wFB_Opt1[FB_RATE0][wRate - RATE_18M],

							       bNeedAck);

			}

		}



		return pDevice->uSIFS + uAckTime + uNextPktTime;

		}

		break;



	default:

		break;