UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6655: extract index manupulation out of function call 

This patch will remove if/else by selecting proper argument before
function call, also index is updated before function call.

Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Link: https://lore.kernel.org/r/1588512552-12297-6-git-send-email-mdujava@kocurkovo.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matej Dujava 2020-05-03 15:29:12 +02:00 committed by Greg Kroah-Hartman
parent ae25983134
commit e3b8577aa1
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/vt6655/rxtx.c
View File

@ -266,7 +266,8 @@ s_uGetDataDuration(
return 0; return 0;
} else { } else {
/* First Frag or Mid Frag */ /* First Frag or Mid Frag */
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck); uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType,
len, wRate, bNeedAck);
} }
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
@ -283,8 +284,8 @@ s_uGetDataDuration(
return 0; return 0;
} else { } else {
/* First Frag or Mid Frag */ /* First Frag or Mid Frag */
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType,
wRate, bNeedAck); len, wRate, bNeedAck);
} }
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
@ -307,17 +308,15 @@ s_uGetDataDuration(
else if (wRate > RATE_54M) else if (wRate > RATE_54M)
wRate = RATE_54M; wRate = RATE_54M;
if (byFBOption == AUTO_FB_0) { wRate -= RATE_18M;
uNextPktTime = s_uGetTxRsvTime(pDevice,
byPktType, len, if (byFBOption == AUTO_FB_0)
wFB_Opt0[FB_RATE0][wRate - RATE_18M], wRate = wFB_Opt0[FB_RATE0][wRate];
bNeedAck); else
} else { wRate = wFB_Opt1[FB_RATE0][wRate];
uNextPktTime = s_uGetTxRsvTime(pDevice,
byPktType, len, uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType,
wFB_Opt1[FB_RATE0][wRate - RATE_18M], len, wRate, bNeedAck);
bNeedAck);
}
} }
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;