Commit fadc3bdf authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rxtx: Replace wRTSDuration* variables

Fix base type to __le16 and remove camel case.

Camel case changes
wRTSDuration* -> rts_duration*
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e01117c
...@@ -613,13 +613,13 @@ static u16 vnt_rxtx_rts_g_fb_head(struct vnt_private *priv, ...@@ -613,13 +613,13 @@ static u16 vnt_rxtx_rts_g_fb_head(struct vnt_private *priv,
pkt_type, current_rate, need_ack, fb_option); 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); 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); 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); 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); frame_len, pkt_type, priv->tx_rate_fb1, need_ack, fb_option);
vnt_fill_ieee80211_rts(priv, &buf->data, eth_hdr, buf->duration_aa); 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, ...@@ -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, buf->duration = s_uGetRTSCTSDuration(priv, RTSDUR_AA, frame_len,
pkt_type, current_rate, need_ack, fb_option); 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); 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); frame_len, pkt_type, priv->tx_rate_fb1, need_ack, fb_option);
vnt_fill_ieee80211_rts(priv, &buf->data, eth_hdr, buf->duration); vnt_fill_ieee80211_rts(priv, &buf->data, eth_hdr, buf->duration);
......
...@@ -127,10 +127,10 @@ struct vnt_rts_g_fb { ...@@ -127,10 +127,10 @@ struct vnt_rts_g_fb {
__le16 duration_aa; __le16 duration_aa;
__le16 duration_bb; __le16 duration_bb;
u16 wReserved; u16 wReserved;
u16 wRTSDuration_ba_f0; __le16 rts_duration_ba_f0;
u16 wRTSDuration_aa_f0; __le16 rts_duration_aa_f0;
u16 wRTSDuration_ba_f1; __le16 rts_duration_ba_f1;
u16 wRTSDuration_aa_f1; __le16 rts_duration_aa_f1;
struct ieee80211_rts data; struct ieee80211_rts data;
struct vnt_tx_datahead_g_fb data_head; struct vnt_tx_datahead_g_fb data_head;
} __packed; } __packed;
...@@ -147,8 +147,8 @@ struct vnt_rts_a_fb { ...@@ -147,8 +147,8 @@ struct vnt_rts_a_fb {
struct vnt_phy_field a; struct vnt_phy_field a;
__le16 duration; __le16 duration;
u16 wReserved; u16 wReserved;
u16 wRTSDuration_f0; __le16 rts_duration_f0;
u16 wRTSDuration_f1; __le16 rts_duration_f1;
struct ieee80211_rts data; struct ieee80211_rts data;
struct vnt_tx_datahead_a_fb data_head; struct vnt_tx_datahead_a_fb data_head;
} __packed; } __packed;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment