This patch renames uAckTime to ack_time 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 4b0a768cf77b..8f28fd1465d4 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -242,7 +242,7 @@ s_uGetDataDuration( ) { bool last_frag = false; - unsigned int uAckTime = 0, uNextPktTime = 0, len; + unsigned int ack_time = 0, uNextPktTime = 0, len; if (frag_idx == (mac_frag_num - 1)) last_frag = true; @@ -255,7 +255,7 @@ s_uGetDataDuration( switch (dur_type) { case DATADUR_B: /* DATADUR_B */ if (need_ack) { - uAckTime = bb_get_frame_time(priv->preamble_type, + ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopCCKBasicRate); } @@ -269,11 +269,11 @@ s_uGetDataDuration( len, rate, need_ack); } - return priv->uSIFS + uAckTime + uNextPktTime; + return priv->uSIFS + ack_time + uNextPktTime; case DATADUR_A: /* DATADUR_A */ if (need_ack) { - uAckTime = bb_get_frame_time(priv->preamble_type, + ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate); } @@ -287,12 +287,12 @@ s_uGetDataDuration( len, rate, need_ack); } - return priv->uSIFS + uAckTime + uNextPktTime; + return priv->uSIFS + ack_time + uNextPktTime; case DATADUR_A_F0: /* DATADUR_A_F0 */ case DATADUR_A_F1: /* DATADUR_A_F1 */ if (need_ack) { - uAckTime = bb_get_frame_time(priv->preamble_type, + ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate); } @@ -318,7 +318,7 @@ s_uGetDataDuration( len, rate, need_ack); } - return priv->uSIFS + uAckTime + uNextPktTime; + return priv->uSIFS + ack_time + uNextPktTime; default: break; -- 2.34.1