diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-19 12:30:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:11:58 -0700 |
| commit | ff5fee22294da7d60ebb8c7b0b3f24aeb1307a7b (patch) | |
| tree | 34ac0b77d9a2de4d4d143122a67fa3a1766f4476 /drivers/staging/vt6656/rxtx.c | |
| parent | 995c91e0c25437329d3ed34148eb709cac1ac5b9 (diff) | |
staging: vt6656: struct vnt_private remove camel case IFS names
Camel case changes
uSIFS -> sifs
uDIFS -> difs
uEIFS -> eifs
uSlot -> slot
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/rxtx.c')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 25a87b0b9c73..aa382e7c1b99 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -125,7 +125,7 @@ static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type, 14, (u16)priv->byTopOFDMBasicRate); if (need_ack) - return data_time + priv->uSIFS + ack_time; + return data_time + priv->sifs + ack_time; return data_time; } @@ -170,12 +170,12 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, ack_time = vnt_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopOFDMBasicRate); - rrv_time = cts_time + ack_time + data_time + 2 * priv->uSIFS; + rrv_time = cts_time + ack_time + data_time + 2 * priv->sifs; return cpu_to_le16((u16)rrv_time); } - rrv_time = rts_time + cts_time + ack_time + data_time + 3 * priv->uSIFS; + rrv_time = rts_time + cts_time + ack_time + data_time + 3 * priv->sifs; return cpu_to_le16((u16)rrv_time); } @@ -193,7 +193,7 @@ static __le16 vnt_get_duration_le(struct vnt_private *piv, ack_time = vnt_get_frame_time(piv->byPreambleType, pkt_type, 14, piv->byTopOFDMBasicRate); - return cpu_to_le16((u16)(piv->uSIFS + ack_time)); + return cpu_to_le16((u16)(piv->sifs + ack_time)); } return 0; @@ -211,7 +211,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type, case RTSDUR_BA_F1: cts_time = vnt_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopCCKBasicRate); - dur_time = cts_time + 2 * priv->uSIFS + + dur_time = cts_time + 2 * priv->sifs + vnt_get_rsvtime(priv, pkt_type, frame_length, rate, need_ack); break; @@ -221,7 +221,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type, case RTSDUR_AA_F1: cts_time = vnt_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopOFDMBasicRate); - dur_time = cts_time + 2 * priv->uSIFS + + dur_time = cts_time + 2 * priv->sifs + vnt_get_rsvtime(priv, pkt_type, frame_length, rate, need_ack); break; @@ -229,7 +229,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type, case CTSDUR_BA: case CTSDUR_BA_F0: case CTSDUR_BA_F1: - dur_time = priv->uSIFS + vnt_get_rsvtime(priv, + dur_time = priv->sifs + vnt_get_rsvtime(priv, pkt_type, frame_length, rate, need_ack); break; |