diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vt6655/rxtx.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 738c4b558276..f329ea79b1b8 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 ack_time = 0, uNextPktTime = 0, len; + unsigned int ack_time = 0, next_pkt_time = 0, len; if (frag_idx == (mac_frag_num - 1)) last_frag = true; @@ -274,11 +274,11 @@ s_uGetDataDuration( return 0; } else { /* First Frag or Mid Frag */ - uNextPktTime = s_uGetTxRsvTime(priv, pkt_type, - len, rate, need_ack); + next_pkt_time = s_uGetTxRsvTime(priv, pkt_type, + len, rate, need_ack); } - return priv->uSIFS + ack_time + uNextPktTime; + return priv->uSIFS + ack_time + next_pkt_time; case DATADUR_A: /* DATADUR_A */ if (need_ack) { @@ -292,11 +292,11 @@ s_uGetDataDuration( return 0; } else { /* First Frag or Mid Frag */ - uNextPktTime = s_uGetTxRsvTime(priv, pkt_type, - len, rate, need_ack); + next_pkt_time = s_uGetTxRsvTime(priv, pkt_type, + len, rate, need_ack); } - return priv->uSIFS + ack_time + uNextPktTime; + return priv->uSIFS + ack_time + next_pkt_time; case DATADUR_A_F0: /* DATADUR_A_F0 */ case DATADUR_A_F1: /* DATADUR_A_F1 */ @@ -323,11 +323,11 @@ s_uGetDataDuration( else rate = fb_opt1[FB_RATE0][rate]; - uNextPktTime = s_uGetTxRsvTime(priv, pkt_type, - len, rate, need_ack); + next_pkt_time = s_uGetTxRsvTime(priv, pkt_type, + len, rate, need_ack); } - return priv->uSIFS + ack_time + uNextPktTime; + return priv->uSIFS + ack_time + next_pkt_time; default: break; |