openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: vt6655: Format long lines. 

Add whitespace around '-' operator and wrap long lines. Issue found by
checkpatch.pl.

Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Link: https://lore.kernel.org/r/e1c9fc822f1576f9896799fea6c467457cf0f6da.1585763457.git.briana.oursler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Briana Oursler 2020-04-01 11:03:42 -07:00 committed by Greg Kroah-Hartman
parent b03ee7b2b8
commit 2f7ccc387c
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,8 +265,11 @@ s_uGetDataDuration(
} 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);
if (bNeedAck) if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uAckTime = BBuGetFrameTime(pDevice->byPreambleType,
byPktType, 14,
pDevice->byTopCCKBasicRate);
}
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
break; break;
@ -280,10 +283,14 @@ s_uGetDataDuration(
return 0; return 0;
} }
} 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);
if (bNeedAck) if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = BBuGetFrameTime(pDevice->byPreambleType,
byPktType, 14,
pDevice->byTopOFDMBasicRate);
}
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
break; break;
@ -303,13 +310,22 @@ s_uGetDataDuration(
wRate = RATE_54M; wRate = RATE_54M;
if (byFBOption == AUTO_FB_0) { 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 { } 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) if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = BBuGetFrameTime(pDevice->byPreambleType,
byPktType, 14,
pDevice->byTopOFDMBasicRate);
}
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
break; break;
@ -329,13 +345,22 @@ s_uGetDataDuration(
wRate = RATE_54M; wRate = RATE_54M;
if (byFBOption == AUTO_FB_0) { 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 { } 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) if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = BBuGetFrameTime(pDevice->byPreambleType,
byPktType, 14,
pDevice->byTopOFDMBasicRate);
}
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
break; break;