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

staging: vt6656: rxtx struct vnt_mic_hdr change tsc_47_16/tsc_15_0

Replace with ccmp_pn with size of IEEE80211_CCMP_PN_LEN(6)

memcpy the struct ieee80211_key_seq -> ccmp.pn onto ccmp_pn
removing the need for endian conversion.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b876e985
...@@ -848,13 +848,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context, ...@@ -848,13 +848,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context,
ieee80211_get_key_tx_seq(tx_key, &seq); ieee80211_get_key_tx_seq(tx_key, &seq);
mic_hdr->tsc_47_16 = cpu_to_be32((u32)seq.ccmp.pn[3] | memcpy(mic_hdr->ccmp_pn, seq.ccmp.pn, IEEE80211_CCMP_PN_LEN);
((u32)seq.ccmp.pn[2] << 8) |
((u32)seq.ccmp.pn[1] << 16) |
((u32)seq.ccmp.pn[0] << 24));
mic_hdr->tsc_15_0 = cpu_to_be16((u16)seq.ccmp.pn[5] |
((u16)seq.ccmp.pn[4] << 8));
if (ieee80211_has_a4(hdr->frame_control)) if (ieee80211_has_a4(hdr->frame_control))
mic_hdr->hlen = cpu_to_be16(28); mic_hdr->hlen = cpu_to_be16(28);
......
...@@ -41,8 +41,7 @@ struct vnt_mic_hdr { ...@@ -41,8 +41,7 @@ struct vnt_mic_hdr {
u8 id; u8 id;
u8 tx_priority; u8 tx_priority;
u8 mic_addr2[6]; u8 mic_addr2[6];
__be32 tsc_47_16; u8 ccmp_pn[IEEE80211_CCMP_PN_LEN];
__be16 tsc_15_0;
__be16 payload_len; __be16 payload_len;
__be16 hlen; __be16 hlen;
__le16 frame_control; __le16 frame_control;
......
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