From: Malcolm Priestley <tvboxspy@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-wireless@vger.kernel.org, Malcolm Priestley <tvboxspy@gmail.com>
Subject: [PATCH 07/14] staging: vt6656: rxtx Replace wTimeStampOff* variables
Date: Tue, 18 Mar 2014 19:25:01 +0000 [thread overview]
Message-ID: <1395170708-2990-7-git-send-email-tvboxspy@gmail.com> (raw)
In-Reply-To: <1395170708-2990-1-git-send-email-tvboxspy@gmail.com>
Fix base type to __le16 and remove camel case.
Camel case changes
wTimeStampOff* -> time_stamp_off*
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
drivers/staging/vt6656/rxtx.c | 14 +++++++-------
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 69afabc..c0c3f50 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 bbb571a..3978174 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;
--
1.9.0
next prev parent reply other threads:[~2014-03-18 19:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 19:24 [PATCH 01/14] staging: vt6656: rxtx Replace wDuration* variables Malcolm Priestley
2014-03-18 19:24 ` [PATCH 02/14] staging: vt6656: rxtx: Replace wRTSDuration* variables Malcolm Priestley
2014-03-18 19:24 ` [PATCH 03/14] staging: vt6656: rxtx: Replace wRTSTxRrvTime* Malcolm Priestley
2014-03-18 19:24 ` [PATCH 04/14] staging: vt6656: rxtx: Replace wTxRrvTime* Malcolm Priestley
2014-03-18 19:24 ` [PATCH 05/14] staging: vt6656: rxtx: Replace wCTSDuration* Malcolm Priestley
2014-03-18 19:25 ` [PATCH 06/14] staging: vt6656: rxtx Replace wCTSTxRrvTime_ba Malcolm Priestley
2014-03-18 19:25 ` Malcolm Priestley [this message]
2014-03-18 19:25 ` [PATCH 08/14] staging: vt6656: struct vnt_tx_short_buf_head correct base types Malcolm Priestley
2014-03-18 19:25 ` [PATCH 09/14] staging: vt6656: vnt_time_stamp_off fix return to __le16 Malcolm Priestley
2014-03-18 19:25 ` [PATCH 10/14] staging: vt6656: rxtx endian correct return duration Malcolm Priestley
2014-03-18 19:25 ` [PATCH 11/14] staging: vt6656: Correct return type s_uGetRTSCTSDuration Malcolm Priestley
2014-03-18 19:25 ` [PATCH 12/14] staging: vt6656: s_uGetDataDuration use __le16 Malcolm Priestley
2014-03-18 19:25 ` [PATCH 13/14] staging: vt6656: vnt_rxtx_rsvtime_le16 fix return Malcolm Priestley
2014-03-18 19:25 ` [PATCH 14/14] staging: vt6656: s_uGetRTSCTSRsvTime " Malcolm Priestley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395170708-2990-7-git-send-email-tvboxspy@gmail.com \
--to=tvboxspy@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).