diff options
| author | Malcolm Priestley | 2014-03-18 20:25:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-03-19 17:00:19 +0100 |
| commit | 10bb39a0437f685030c70834c6879f188fff942e (patch) | |
| tree | 211fbb94b33b627cae84e4c0c63cb31efdb0d27e /drivers/staging/vt6656 | |
| parent | staging: vt6656: rxtx Replace wCTSTxRrvTime_ba (diff) | |
| download | kernel-qcow2-linux-10bb39a0437f685030c70834c6879f188fff942e.tar.gz kernel-qcow2-linux-10bb39a0437f685030c70834c6879f188fff942e.tar.xz kernel-qcow2-linux-10bb39a0437f685030c70834c6879f188fff942e.zip | |
staging: vt6656: rxtx Replace wTimeStampOff* variables
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>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 14 | ||||
| -rw-r--r-- | drivers/staging/vt6656/rxtx.h | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 69afabc5d33d..c0c3f503c3ce 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -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; diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index bbb571aa2ba8..39781742c6d9 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -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; |