From fadc3bdfd91012407026deb07b4f2a3dd0123326 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Tue, 18 Mar 2014 19:24:56 +0000 Subject: [PATCH] staging: vt6656: rxtx: Replace wRTSDuration* variables Fix base type to __le16 and remove camel case. Camel case changes wRTSDuration* -> rts_duration* Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/rxtx.c | 12 ++++++------ drivers/staging/vt6656/rxtx.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 5507db84bd39..1a29251edf01 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -613,13 +613,13 @@ static u16 vnt_rxtx_rts_g_fb_head(struct vnt_private *priv, pkt_type, current_rate, need_ack, fb_option); - buf->wRTSDuration_ba_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_BA_F0, + buf->rts_duration_ba_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_BA_F0, frame_len, pkt_type, priv->tx_rate_fb0, need_ack, fb_option); - buf->wRTSDuration_aa_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F0, + buf->rts_duration_aa_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F0, frame_len, pkt_type, priv->tx_rate_fb0, need_ack, fb_option); - buf->wRTSDuration_ba_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_BA_F1, + buf->rts_duration_ba_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_BA_F1, frame_len, pkt_type, priv->tx_rate_fb1, need_ack, fb_option); - buf->wRTSDuration_aa_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F1, + buf->rts_duration_aa_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F1, frame_len, pkt_type, priv->tx_rate_fb1, need_ack, fb_option); vnt_fill_ieee80211_rts(priv, &buf->data, eth_hdr, buf->duration_aa); @@ -660,10 +660,10 @@ static u16 vnt_rxtx_rts_a_fb_head(struct vnt_private *priv, buf->duration = s_uGetRTSCTSDuration(priv, RTSDUR_AA, frame_len, pkt_type, current_rate, need_ack, fb_option); - buf->wRTSDuration_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F0, + buf->rts_duration_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F0, frame_len, pkt_type, priv->tx_rate_fb0, need_ack, fb_option); - buf->wRTSDuration_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F1, + buf->rts_duration_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F1, frame_len, pkt_type, priv->tx_rate_fb1, need_ack, fb_option); vnt_fill_ieee80211_rts(priv, &buf->data, eth_hdr, buf->duration); diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index d677d0766d8c..bb2d0ce4c7bd 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -127,10 +127,10 @@ struct vnt_rts_g_fb { __le16 duration_aa; __le16 duration_bb; u16 wReserved; - u16 wRTSDuration_ba_f0; - u16 wRTSDuration_aa_f0; - u16 wRTSDuration_ba_f1; - u16 wRTSDuration_aa_f1; + __le16 rts_duration_ba_f0; + __le16 rts_duration_aa_f0; + __le16 rts_duration_ba_f1; + __le16 rts_duration_aa_f1; struct ieee80211_rts data; struct vnt_tx_datahead_g_fb data_head; } __packed; @@ -147,8 +147,8 @@ struct vnt_rts_a_fb { struct vnt_phy_field a; __le16 duration; u16 wReserved; - u16 wRTSDuration_f0; - u16 wRTSDuration_f1; + __le16 rts_duration_f0; + __le16 rts_duration_f1; struct ieee80211_rts data; struct vnt_tx_datahead_a_fb data_head; } __packed;