|
@@ -213,12 +213,12 @@ s_uGetRTSCTSRsvTime(
|
|
|
} else if (byRTSRsvType == 3) { /* CTSTxRrvTime_ba, only in 2.4GHZ */
|
|
|
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
|
|
|
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
|
|
|
- uRrvTime = uCTSTime + uAckTime + uDataTime + 2*pDevice->uSIFS;
|
|
|
+ uRrvTime = uCTSTime + uAckTime + uDataTime + 2 * pDevice->uSIFS;
|
|
|
return cpu_to_le16((u16)uRrvTime);
|
|
|
}
|
|
|
|
|
|
/* RTSRrvTime */
|
|
|
- uRrvTime = uRTSTime + uCTSTime + uAckTime + uDataTime + 3*pDevice->uSIFS;
|
|
|
+ uRrvTime = uRTSTime + uCTSTime + uAckTime + uDataTime + 3 * pDevice->uSIFS;
|
|
|
return cpu_to_le16((u16)uRrvTime);
|
|
|
}
|
|
|
|
|
@@ -241,7 +241,7 @@ s_uGetDataDuration(
|
|
|
bool bLastFrag = false;
|
|
|
unsigned int uAckTime = 0, uNextPktTime = 0;
|
|
|
|
|
|
- if (uFragIdx == (uMACfragNum-1))
|
|
|
+ if (uFragIdx == (uMACfragNum - 1))
|
|
|
bLastFrag = true;
|
|
|
|
|
|
switch (byDurType) {
|
|
@@ -254,7 +254,7 @@ s_uGetDataDuration(
|
|
|
return 0;
|
|
|
}
|
|
|
} else {/* First Frag or Mid Frag */
|
|
|
- if (uFragIdx == (uMACfragNum-2))
|
|
|
+ if (uFragIdx == (uMACfragNum - 2))
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wRate, bNeedAck);
|
|
|
else
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
|
|
@@ -277,7 +277,7 @@ s_uGetDataDuration(
|
|
|
return 0;
|
|
|
}
|
|
|
} else {/* First Frag or Mid Frag */
|
|
|
- if (uFragIdx == (uMACfragNum-2))
|
|
|
+ if (uFragIdx == (uMACfragNum - 2))
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wRate, bNeedAck);
|
|
|
else
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
|
|
@@ -306,7 +306,7 @@ s_uGetDataDuration(
|
|
|
else if (wRate > RATE_54M)
|
|
|
wRate = RATE_54M;
|
|
|
|
|
|
- if (uFragIdx == (uMACfragNum-2))
|
|
|
+ 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);
|
|
@@ -317,7 +317,7 @@ s_uGetDataDuration(
|
|
|
else if (wRate > RATE_54M)
|
|
|
wRate = RATE_54M;
|
|
|
|
|
|
- if (uFragIdx == (uMACfragNum-2))
|
|
|
+ if (uFragIdx == (uMACfragNum - 2))
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE0][wRate-RATE_18M], bNeedAck);
|
|
|
else
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0][wRate-RATE_18M], bNeedAck);
|
|
@@ -347,7 +347,7 @@ s_uGetDataDuration(
|
|
|
else if (wRate > RATE_54M)
|
|
|
wRate = RATE_54M;
|
|
|
|
|
|
- if (uFragIdx == (uMACfragNum-2))
|
|
|
+ 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);
|
|
@@ -358,7 +358,7 @@ s_uGetDataDuration(
|
|
|
else if (wRate > RATE_54M)
|
|
|
wRate = RATE_54M;
|
|
|
|
|
|
- if (uFragIdx == (uMACfragNum-2))
|
|
|
+ if (uFragIdx == (uMACfragNum - 2))
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE1][wRate-RATE_18M], bNeedAck);
|
|
|
else
|
|
|
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1][wRate-RATE_18M], bNeedAck);
|