staging: vt6656: rxtx Replace wTimeStampOff* variables
authorMalcolm Priestley <tvboxspy@gmail.com>
Tue, 18 Mar 2014 19:25:01 +0000 (19:25 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Mar 2014 16:00:19 +0000 (09:00 -0700)
Fix base type to __le16 and remove camel case.

Camel case changes
wTimeStampOff* -> time_stamp_off*

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

index 69afabc5d33d9043684165aea9d63533da8ba03d..c0c3f503c3ce93ef65b0369af814413aa4e5b2b9 100644 (file)
@@ -484,8 +484,8 @@ static u16 vnt_rxtx_datahead_g(struct vnt_private *priv, u8 pkt_type, u16 rate,
        buf->duration_a = s_uGetDataDuration(priv, pkt_type, need_ack);
        buf->duration_b = s_uGetDataDuration(priv, PK_TYPE_11B, need_ack);
 
-       buf->wTimeStampOff_a = vnt_time_stamp_off(priv, rate);
-       buf->wTimeStampOff_b = vnt_time_stamp_off(priv,
+       buf->time_stamp_off_a = vnt_time_stamp_off(priv, rate);
+       buf->time_stamp_off_b = vnt_time_stamp_off(priv,
                                        priv->byTopCCKBasicRate);
 
        return buf->duration_a;
@@ -508,8 +508,8 @@ static u16 vnt_rxtx_datahead_g_fb(struct vnt_private *priv, u8 pkt_type,
        buf->duration_a_f0 = s_uGetDataDuration(priv, pkt_type, need_ack);
        buf->duration_a_f1 = s_uGetDataDuration(priv, pkt_type, need_ack);
 
-       buf->wTimeStampOff_a = vnt_time_stamp_off(priv, rate);
-       buf->wTimeStampOff_b = vnt_time_stamp_off(priv,
+       buf->time_stamp_off_a = vnt_time_stamp_off(priv, rate);
+       buf->time_stamp_off_b = vnt_time_stamp_off(priv,
                                                priv->byTopCCKBasicRate);
 
        return buf->duration_a;
@@ -527,7 +527,7 @@ static u16 vnt_rxtx_datahead_a_fb(struct vnt_private *priv, u8 pkt_type,
        buf->duration_f0 = s_uGetDataDuration(priv, pkt_type, need_ack);
        buf->duration_f1 = s_uGetDataDuration(priv, pkt_type, need_ack);
 
-       buf->wTimeStampOff = vnt_time_stamp_off(priv, rate);
+       buf->time_stamp_off = vnt_time_stamp_off(priv, rate);
 
        return buf->duration;
 }
@@ -541,14 +541,14 @@ static u16 vnt_rxtx_datahead_ab(struct vnt_private *priv, u8 pkt_type,
        /* Get Duration and TimeStampOff */
        buf->duration = s_uGetDataDuration(priv, pkt_type, need_ack);
 
-       buf->wTimeStampOff = vnt_time_stamp_off(priv, rate);
+       buf->time_stamp_off = vnt_time_stamp_off(priv, rate);
 
        return buf->duration;
 }
 
 static int vnt_fill_ieee80211_rts(struct vnt_private *priv,
        struct ieee80211_rts *rts, struct ethhdr *eth_hdr,
-               u16 duration)
+               __le16 duration)
 {
        rts->duration = duration;
        rts->frame_control = TYPE_CTL_RTS;
index bbb571aa2ba8f829830115f86ab6a3e590affccc..39781742c6d9251d856563a0ca6fdc17e23a0ed3 100644 (file)
@@ -79,8 +79,8 @@ struct vnt_tx_datahead_g {
        struct vnt_phy_field a;
        __le16 duration_b;
        __le16 duration_a;
-       u16 wTimeStampOff_b;
-       u16 wTimeStampOff_a;
+       __le16 time_stamp_off_b;
+       __le16 time_stamp_off_a;
 } __packed;
 
 struct vnt_tx_datahead_g_fb {
@@ -90,20 +90,20 @@ struct vnt_tx_datahead_g_fb {
        __le16 duration_a;
        __le16 duration_a_f0;
        __le16 duration_a_f1;
-       u16 wTimeStampOff_b;
-       u16 wTimeStampOff_a;
+       __le16 time_stamp_off_b;
+       __le16 time_stamp_off_a;
 } __packed;
 
 struct vnt_tx_datahead_ab {
        struct vnt_phy_field ab;
        __le16 duration;
-       u16 wTimeStampOff;
+       __le16 time_stamp_off;
 } __packed;
 
 struct vnt_tx_datahead_a_fb {
        struct vnt_phy_field a;
        __le16 duration;
-       u16 wTimeStampOff;
+       __le16 time_stamp_off;
        __le16 duration_f0;
        __le16 duration_f1;
 } __packed;