diff options
| -rw-r--r-- | drivers/staging/vt6655/rxtx.c | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 72bb49c064c7..81d0deba80eb 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -265,8 +265,11 @@ s_uGetDataDuration( } else {/* First Frag or Mid Frag */ uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck); - if (bNeedAck) - uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); + if (bNeedAck) { + uAckTime = BBuGetFrameTime(pDevice->byPreambleType, + byPktType, 14, + pDevice->byTopCCKBasicRate); + } return pDevice->uSIFS + uAckTime + uNextPktTime; } break; @@ -280,10 +283,14 @@ s_uGetDataDuration( return 0; } } else {/* First Frag or Mid Frag */ - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck); + uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, + wRate, bNeedAck); - if (bNeedAck) - uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); + if (bNeedAck) { + uAckTime = BBuGetFrameTime(pDevice->byPreambleType, + byPktType, 14, + pDevice->byTopOFDMBasicRate); + } return pDevice->uSIFS + uAckTime + uNextPktTime; } break; @@ -303,13 +310,22 @@ s_uGetDataDuration( wRate = RATE_54M; if (byFBOption == AUTO_FB_0) { - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck); + uNextPktTime = s_uGetTxRsvTime(pDevice, + byPktType, len, + wFB_Opt0[FB_RATE0][wRate - RATE_18M], + bNeedAck); } else { - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wFB_Opt1[FB_RATE0][wRate-RATE_18M], bNeedAck); + uNextPktTime = s_uGetTxRsvTime(pDevice, + byPktType, len, + wFB_Opt1[FB_RATE0][wRate - RATE_18M], + bNeedAck); } - if (bNeedAck) - uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); + if (bNeedAck) { + uAckTime = BBuGetFrameTime(pDevice->byPreambleType, + byPktType, 14, + pDevice->byTopOFDMBasicRate); + } return pDevice->uSIFS + uAckTime + uNextPktTime; } break; @@ -329,13 +345,22 @@ s_uGetDataDuration( wRate = RATE_54M; if (byFBOption == AUTO_FB_0) { - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck); + uNextPktTime = s_uGetTxRsvTime(pDevice, + byPktType, len, + wFB_Opt0[FB_RATE0][wRate - RATE_18M], + bNeedAck); } else { - uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wFB_Opt1[FB_RATE0][wRate-RATE_18M], bNeedAck); + uNextPktTime = s_uGetTxRsvTime(pDevice, + byPktType, len, + wFB_Opt1[FB_RATE0][wRate - RATE_18M], + bNeedAck); } - if (bNeedAck) - uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); + if (bNeedAck) { + uAckTime = BBuGetFrameTime(pDevice->byPreambleType, + byPktType, 14, + pDevice->byTopOFDMBasicRate); + } return pDevice->uSIFS + uAckTime + uNextPktTime; } break; |