staging: vt6656: rename s_uGetTxRsvTime to vnt_get_rsvtime
authorMalcolm Priestley <tvboxspy@gmail.com>
Fri, 11 Jul 2014 00:08:24 +0000 (01:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Jul 2014 00:34:27 +0000 (17:34 -0700)
Drop tx from name

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c

index ceaaca0a296e622628633ce725c21ebc0e2f6cf1..5084434229a9d9e43f303c53c00c2866ce59dcdd 100644 (file)
@@ -32,7 +32,7 @@
  *      s_uFillDataHead- fulfill tx data duration header
  *      vnt_get_rtscts_duration_le- get rtx/cts required duration
  *      vnt_get_rtscts_rsvtime_le- get rts/cts reserved time
- *      s_uGetTxRsvTime- get frame reserved time
+ *      vnt_get_rsvtime- get frame reserved time
  *      vnt_fill_cts_head- fulfill CTS ctl header
  *      s_vFillFragParameter- Set fragment ctl parameter.
  *      s_vFillRTSHead- fulfill RTS ctl header
@@ -83,7 +83,7 @@ static const u16 wFB_Opt1[2][5] = {
 
 static struct vnt_usb_send_context *s_vGetFreeContext(struct vnt_private *);
 
-static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, u8 byPktType,
+static unsigned int vnt_get_rsvtime(struct vnt_private *pDevice, u8 byPktType,
        u32 cbFrameLength, u16 wRate, int bNeedAck);
 
 static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
@@ -137,7 +137,7 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
              PK_TYPE_11GB    2
              PK_TYPE_11GA    3
 */
-static u32 s_uGetTxRsvTime(struct vnt_private *priv, u8 pkt_type,
+static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
        u32 frame_length, u16 rate, int need_ack)
 {
        u32 data_time, ack_time;
@@ -161,7 +161,7 @@ static u32 s_uGetTxRsvTime(struct vnt_private *priv, u8 pkt_type,
 static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type,
        u32 frame_length, u16 rate, int need_ack)
 {
-       return cpu_to_le16((u16)s_uGetTxRsvTime(priv, pkt_type,
+       return cpu_to_le16((u16)vnt_get_rsvtime(priv, pkt_type,
                frame_length, rate, need_ack));
 }
 
@@ -243,7 +243,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type,
                cts_time = vnt_get_frame_time(priv->byPreambleType,
                                pkt_type, 14, priv->byTopCCKBasicRate);
                dur_time = cts_time + 2 * priv->uSIFS +
-                       s_uGetTxRsvTime(priv, pkt_type,
+                       vnt_get_rsvtime(priv, pkt_type,
                                                frame_length, rate, need_ack);
                break;
 
@@ -253,14 +253,14 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type,
                cts_time = vnt_get_frame_time(priv->byPreambleType,
                                pkt_type, 14, priv->byTopOFDMBasicRate);
                dur_time = cts_time + 2 * priv->uSIFS +
-                       s_uGetTxRsvTime(priv, pkt_type,
+                       vnt_get_rsvtime(priv, pkt_type,
                                                frame_length, rate, need_ack);
                break;
 
        case CTSDUR_BA:
        case CTSDUR_BA_F0:
        case CTSDUR_BA_F1:
-               dur_time = priv->uSIFS + s_uGetTxRsvTime(priv,
+               dur_time = priv->uSIFS + vnt_get_rsvtime(priv,
                                pkt_type, frame_length, rate, need_ack);
                break;