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

staging: vt6655: remove else after return and invert condition 

This patch will prepare us to make return at the end of case body

Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Link: https://lore.kernel.org/r/1588512552-12297-4-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:10 +02:00 committed by Greg Kroah-Hartman
parent 0ae73acc44
commit 3be1acffe6
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,13 +260,13 @@ s_uGetDataDuration(
byPktType, 14, byPktType, 14,
pDevice->byTopCCKBasicRate); pDevice->byTopCCKBasicRate);
} }
if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ /* Non Frag or Last Frag */
if (bNeedAck) { if ((uMACfragNum == 1) || bLastFrag) {
return pDevice->uSIFS + uAckTime; if (!bNeedAck)
} else {
return 0; return 0;
} return pDevice->uSIFS + uAckTime;
} else {/* First Frag or Mid Frag */ } else {
/* 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;
@ -279,13 +279,13 @@ s_uGetDataDuration(
byPktType, 14, byPktType, 14,
pDevice->byTopOFDMBasicRate); pDevice->byTopOFDMBasicRate);
} }
if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ /* Non Frag or Last Frag */
if (bNeedAck) { if ((uMACfragNum == 1) || bLastFrag) {
return pDevice->uSIFS + uAckTime; if (!bNeedAck)
} else {
return 0; return 0;
} return pDevice->uSIFS + uAckTime;
} else {/* First Frag or Mid Frag */ } else {
/* First Frag or Mid Frag */
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len,
wRate, bNeedAck); wRate, bNeedAck);
@ -300,13 +300,13 @@ s_uGetDataDuration(
byPktType, 14, byPktType, 14,
pDevice->byTopOFDMBasicRate); pDevice->byTopOFDMBasicRate);
} }
if (((uMACfragNum == 1)) || bLastFrag) { /* Non Frag or Last Frag */ /* Non Frag or Last Frag */
if (bNeedAck) { if ((uMACfragNum == 1) || bLastFrag) {
return pDevice->uSIFS + uAckTime; if (!bNeedAck)
} else {
return 0; return 0;
} return pDevice->uSIFS + uAckTime;
} else { /* First Frag or Mid Frag */ } else {
/* First Frag or Mid Frag */
if (wRate < RATE_18M) if (wRate < RATE_18M)
wRate = RATE_18M; wRate = RATE_18M;
else if (wRate > RATE_54M) else if (wRate > RATE_54M)