This patch renames wRate to rate in s_uGetDataDuration function in order to avoid using camel case. Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@xxxxxxxxxxxxxx> --- drivers/staging/vt6655/rxtx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index dd228962dd77..7dd57d2e2831 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -233,7 +233,7 @@ s_uGetDataDuration( unsigned char dur_type, unsigned int frame_length, unsigned char pkt_type, - unsigned short wRate, + unsigned short rate, bool bNeedAck, unsigned int uFragIdx, unsigned int cbLastFragmentSize, @@ -266,7 +266,7 @@ s_uGetDataDuration( } else { /* First Frag or Mid Frag */ uNextPktTime = s_uGetTxRsvTime(priv, pkt_type, - len, wRate, bNeedAck); + len, rate, bNeedAck); } return priv->uSIFS + uAckTime + uNextPktTime; @@ -284,7 +284,7 @@ s_uGetDataDuration( } else { /* First Frag or Mid Frag */ uNextPktTime = s_uGetTxRsvTime(priv, pkt_type, - len, wRate, bNeedAck); + len, rate, bNeedAck); } return priv->uSIFS + uAckTime + uNextPktTime; @@ -302,20 +302,20 @@ s_uGetDataDuration( return 0; } else { /* First Frag or Mid Frag */ - if (wRate < RATE_18M) - wRate = RATE_18M; - else if (wRate > RATE_54M) - wRate = RATE_54M; + if (rate < RATE_18M) + rate = RATE_18M; + else if (rate > RATE_54M) + rate = RATE_54M; - wRate -= RATE_18M; + rate -= RATE_18M; if (byFBOption == AUTO_FB_0) - wRate = fb_opt0[FB_RATE0][wRate]; + rate = fb_opt0[FB_RATE0][rate]; else - wRate = fb_opt1[FB_RATE0][wRate]; + rate = fb_opt1[FB_RATE0][rate]; uNextPktTime = s_uGetTxRsvTime(priv, pkt_type, - len, wRate, bNeedAck); + len, rate, bNeedAck); } return priv->uSIFS + uAckTime + uNextPktTime; -- 2.34.1