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

staging: vt6656: rxtx replace wFragCtl with frag_ctl.

Use base type to __le16 and do endian correction.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79f976dc
...@@ -978,21 +978,21 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) ...@@ -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) if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
is_pspoll = true; is_pspoll = true;
tx_buffer_head->wFragCtl = tx_buffer_head->frag_ctl =
cpu_to_le16(ieee80211_get_hdrlen_from_skb(skb)) << 10; cpu_to_le16(ieee80211_get_hdrlen_from_skb(skb) << 10);
if (info->control.hw_key) { if (info->control.hw_key) {
tx_key = info->control.hw_key; tx_key = info->control.hw_key;
switch (info->control.hw_key->cipher) { switch (info->control.hw_key->cipher) {
case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP40:
case WLAN_CIPHER_SUITE_WEP104: case WLAN_CIPHER_SUITE_WEP104:
tx_buffer_head->wFragCtl |= FRAGCTL_LEGACY; tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_LEGACY);
break; break;
case WLAN_CIPHER_SUITE_TKIP: case WLAN_CIPHER_SUITE_TKIP:
tx_buffer_head->wFragCtl |= FRAGCTL_TKIP; tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_TKIP);
break; break;
case WLAN_CIPHER_SUITE_CCMP: case WLAN_CIPHER_SUITE_CCMP:
tx_buffer_head->wFragCtl |= FRAGCTL_AES; tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_AES);
need_mic = true; need_mic = true;
default: default:
break; break;
...@@ -1033,7 +1033,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) ...@@ -1033,7 +1033,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
return -ENOMEM; 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; tx_bytes = tx_header_size + tx_body_size;
......
...@@ -224,7 +224,7 @@ struct vnt_tx_fifo_head { ...@@ -224,7 +224,7 @@ struct vnt_tx_fifo_head {
u8 tx_key[WLAN_KEY_LEN_CCMP]; u8 tx_key[WLAN_KEY_LEN_CCMP];
u16 wFIFOCtl; u16 wFIFOCtl;
__le16 time_stamp; __le16 time_stamp;
u16 wFragCtl; __le16 frag_ctl;
__le16 current_rate; __le16 current_rate;
} __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