diff options
| author |   Matej Dujava <mdujava@kocurkovo.cz> | 2020-05-03 15:29:10 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-05 12:31:19 +0200 |
| commit | 3be1acffe684b11b9447cc7140ea0e59efa19a20 (patch) | |
| tree | b08457c6fae475bea06de50637762a8f2f16f538 /drivers/staging/vt6655 | |
| parent | staging: vt6655: do calculation of uAckTime first (diff) | |
| download | linux-dev-3be1acffe684b11b9447cc7140ea0e59efa19a20.tar.xz linux-dev-3be1acffe684b11b9447cc7140ea0e59efa19a20.zip | |
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>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/rxtx.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 01ceace253a4..61f7077bb75f 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -260,13 +260,13 @@ s_uGetDataDuration( byPktType, 14, pDevice->byTopCCKBasicRate); } - if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ - if (bNeedAck) { - return pDevice->uSIFS + uAckTime; - } else { + /* Non Frag or Last Frag */ + if ((uMACfragNum == 1) || bLastFrag) { + if (!bNeedAck) return 0; - } - } else {/* First Frag or Mid Frag */ + return pDevice->uSIFS + uAckTime; + } else { + /* First Frag or Mid Frag */ uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck); return pDevice->uSIFS + uAckTime + uNextPktTime; @@ -279,13 +279,13 @@ s_uGetDataDuration( byPktType, 14, pDevice->byTopOFDMBasicRate); } - if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ - if (bNeedAck) { - return pDevice->uSIFS + uAckTime; - } else { + /* Non Frag or Last Frag */ + if ((uMACfragNum == 1) || bLastFrag) { + if (!bNeedAck) return 0; - } - } else {/* First Frag or Mid Frag */ + return pDevice->uSIFS + uAckTime; + } else { + /* First Frag or Mid Frag */ uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck); @@ -300,13 +300,13 @@ s_uGetDataDuration( byPktType, 14, pDevice->byTopOFDMBasicRate); } - if (((uMACfragNum == 1)) || bLastFrag) { /* Non Frag or Last Frag */ - if (bNeedAck) { - return pDevice->uSIFS + uAckTime; - } else { + /* Non Frag or Last Frag */ + if ((uMACfragNum == 1) || bLastFrag) { + if (!bNeedAck) return 0; - } - } else { /* First Frag or Mid Frag */ + return pDevice->uSIFS + uAckTime; + } else { + /* First Frag or Mid Frag */ if (wRate < RATE_18M) wRate = RATE_18M; else if (wRate > RATE_54M) |