diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-06-29 02:55:40 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 01:25:53 +0400 |
| commit | 5deb1cfa88f3f4bf2f8d07eda075d338db3b6115 (patch) | |
| tree | b228249194a6df8a92a922a20430e7f937793255 /drivers | |
| parent | 79f976dc3170b3c1b8b0b4e5a92151dba1b07427 (diff) | |
| download | linux-5deb1cfa88f3f4bf2f8d07eda075d338db3b6115.tar.xz | |
staging: vt6656: rxtx replace wFragCtl with frag_ctl.
Use base type to __le16 and do endian correction.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 12 | ||||
| -rw-r--r-- | 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 f4833ff2a9eb..55131216f896 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 26dc21c51e22..1cfa5aeddad4 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; |