diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-06-28 23:55:39 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-29 14:25:53 -0700 |
commit | 79f976dc3170b3c1b8b0b4e5a92151dba1b07427 (patch) | |
tree | 00a7fcd8c27d26516257dacb855660008b0fcf41 | |
parent | b876e985c2273b7bd2d5539f2147ef69f7701129 (diff) | |
download | op-kernel-dev-79f976dc3170b3c1b8b0b4e5a92151dba1b07427.zip op-kernel-dev-79f976dc3170b3c1b8b0b4e5a92151dba1b07427.tar.gz |
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: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 8 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.h | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 7c9f232..f4833ff 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -848,13 +848,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context, ieee80211_get_key_tx_seq(tx_key, &seq); - mic_hdr->tsc_47_16 = cpu_to_be32((u32)seq.ccmp.pn[3] | - ((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)); + memcpy(mic_hdr->ccmp_pn, seq.ccmp.pn, IEEE80211_CCMP_PN_LEN); if (ieee80211_has_a4(hdr->frame_control)) mic_hdr->hlen = cpu_to_be16(28); diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 847c055..26dc21c 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -41,8 +41,7 @@ struct vnt_mic_hdr { u8 id; u8 tx_priority; u8 mic_addr2[6]; - __be32 tsc_47_16; - __be16 tsc_15_0; + u8 ccmp_pn[IEEE80211_CCMP_PN_LEN]; __be16 payload_len; __be16 hlen; __le16 frame_control; |