From: Dominik Karol PiÄ…tkowski Date: Wed, 18 Sep 2024 19:21:51 +0000 (+0000) Subject: staging: vt6655: s_uGetDataDuration: Rename uAckTime variable X-Git-Tag: v6.13-rc1~30^2~167 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b0ab3e5b446cb167a7a1d2dbac72222edc17089;p=thirdparty%2Flinux.git staging: vt6655: s_uGetDataDuration: Rename uAckTime variable 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 Link: https://lore.kernel.org/r/20240918191959.51539-13-dominik.karol.piatkowski@protonmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 60f255e9f4c8e..738c4b558276b 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -251,7 +251,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; @@ -264,7 +264,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); } @@ -278,11 +278,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); } @@ -296,12 +296,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); } @@ -327,7 +327,7 @@ s_uGetDataDuration( len, rate, need_ack); } - return priv->uSIFS + uAckTime + uNextPktTime; + return priv->uSIFS + ack_time + uNextPktTime; default: break;