From: Malcolm Priestley <tvboxspy@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-wireless@vger.kernel.org, Malcolm Priestley <tvboxspy@gmail.com>
Subject: [PATCH 2/8] staging: vt6656: rxtx replace wFragCtl with frag_ctl.
Date: Sat, 28 Jun 2014 23:55:40 +0100 [thread overview]
Message-ID: <1403996146-4082-2-git-send-email-tvboxspy@gmail.com> (raw)
In-Reply-To: <1403996146-4082-1-git-send-email-tvboxspy@gmail.com>
Use base type to __le16 and do endian correction.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
drivers/staging/vt6656/rxtx.c | 12 ++++++------
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index f4833ff..5513121 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -978,21 +978,21 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
is_pspoll = true;
- tx_buffer_head->wFragCtl =
- cpu_to_le16(ieee80211_get_hdrlen_from_skb(skb)) << 10;
+ tx_buffer_head->frag_ctl =
+ cpu_to_le16(ieee80211_get_hdrlen_from_skb(skb) << 10);
if (info->control.hw_key) {
tx_key = info->control.hw_key;
switch (info->control.hw_key->cipher) {
case WLAN_CIPHER_SUITE_WEP40:
case WLAN_CIPHER_SUITE_WEP104:
- tx_buffer_head->wFragCtl |= FRAGCTL_LEGACY;
+ tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_LEGACY);
break;
case WLAN_CIPHER_SUITE_TKIP:
- tx_buffer_head->wFragCtl |= FRAGCTL_TKIP;
+ tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_TKIP);
break;
case WLAN_CIPHER_SUITE_CCMP:
- tx_buffer_head->wFragCtl |= FRAGCTL_AES;
+ tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_AES);
need_mic = true;
default:
break;
@@ -1033,7 +1033,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
return -ENOMEM;
}
- tx_buffer_head->wFragCtl |= (u16)FRAGCTL_NONFRAG;
+ tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_NONFRAG);
tx_bytes = tx_header_size + tx_body_size;
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 26dc21c..1cfa5ae 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -224,7 +224,7 @@ struct vnt_tx_fifo_head {
u8 tx_key[WLAN_KEY_LEN_CCMP];
u16 wFIFOCtl;
__le16 time_stamp;
- u16 wFragCtl;
+ __le16 frag_ctl;
__le16 current_rate;
} __packed;
--
1.9.1
next prev parent reply other threads:[~2014-06-28 22:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 22:55 [PATCH 1/8] staging: vt6656: rxtx struct vnt_mic_hdr change tsc_47_16/tsc_15_0 Malcolm Priestley
2014-06-28 22:55 ` Malcolm Priestley [this message]
2014-06-28 22:55 ` [PATCH 3/8] staging: vt6656: vnt_tx_packet remove first assignment of time_stamp Malcolm Priestley
2014-06-28 22:55 ` [PATCH 4/8] staging: vt6656: Remove rx handing from RXvWorkItem Malcolm Priestley
2014-06-28 22:55 ` [PATCH 5/8] staging: vt6656: dead code remove RXvWorkItem and RXvFreeRCB Malcolm Priestley
2014-06-28 22:55 ` [PATCH 6/8] staging: vt6656: remove vnt_add_basic_rate Malcolm Priestley
2014-06-28 22:55 ` [PATCH 7/8] staging: vt6656: set BBvSetVGAGainOffset inside vnt_set_bss_mode Malcolm Priestley
2014-06-28 22:55 ` [PATCH 8/8] staging: vt6656: device_init_registers move out vnt_set_bss_mode 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=1403996146-4082-2-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).