Staging: vt6655: Move rate determination logic.
Factor rate setting logic out of nested if-else statement to prevent code duplication. Signed-off-by: Briana Oursler <briana.oursler@gmail.com> Reviewed-by: Stefano Brivio <sbrivio@redhat.com> Link: https://lore.kernel.org/r/ba87af8a2d28d5737c6d8888bbda143aad723d2c.1585763457.git.briana.oursler@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5b0578364f
commit
e781fd1b33
|
@ -298,23 +298,18 @@ s_uGetDataDuration(
|
|||
return 0;
|
||||
}
|
||||
} else { /* First Frag or Mid Frag */
|
||||
if (byFBOption == AUTO_FB_0) {
|
||||
if (wRate < RATE_18M)
|
||||
wRate = RATE_18M;
|
||||
else if (wRate > RATE_54M)
|
||||
wRate = RATE_54M;
|
||||
if (wRate < RATE_18M)
|
||||
wRate = RATE_18M;
|
||||
else if (wRate > RATE_54M)
|
||||
wRate = RATE_54M;
|
||||
|
||||
if (byFBOption == AUTO_FB_0) {
|
||||
if (uFragIdx == (uMACfragNum - 2))
|
||||
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck);
|
||||
else
|
||||
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck);
|
||||
|
||||
} else { /* (byFBOption == AUTO_FB_1) */
|
||||
if (wRate < RATE_18M)
|
||||
wRate = RATE_18M;
|
||||
else if (wRate > RATE_54M)
|
||||
wRate = RATE_54M;
|
||||
|
||||
if (uFragIdx == (uMACfragNum - 2))
|
||||
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE0][wRate-RATE_18M], bNeedAck);
|
||||
else
|
||||
|
@ -336,23 +331,18 @@ s_uGetDataDuration(
|
|||
return 0;
|
||||
}
|
||||
} else { /* First Frag or Mid Frag */
|
||||
if (byFBOption == AUTO_FB_0) {
|
||||
if (wRate < RATE_18M)
|
||||
wRate = RATE_18M;
|
||||
else if (wRate > RATE_54M)
|
||||
wRate = RATE_54M;
|
||||
if (wRate < RATE_18M)
|
||||
wRate = RATE_18M;
|
||||
else if (wRate > RATE_54M)
|
||||
wRate = RATE_54M;
|
||||
|
||||
if (byFBOption == AUTO_FB_0) {
|
||||
if (uFragIdx == (uMACfragNum - 2))
|
||||
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wFB_Opt0[FB_RATE1][wRate-RATE_18M], bNeedAck);
|
||||
else
|
||||
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate-RATE_18M], bNeedAck);
|
||||
|
||||
} else { /* (byFBOption == AUTO_FB_1) */
|
||||
if (wRate < RATE_18M)
|
||||
wRate = RATE_18M;
|
||||
else if (wRate > RATE_54M)
|
||||
wRate = RATE_54M;
|
||||
|
||||
if (uFragIdx == (uMACfragNum - 2))
|
||||
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE1][wRate-RATE_18M], bNeedAck);
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue