staging: vt6656: rxtx replace adwTxKey[4]

Replace with tx_key with size of WLAN_KEY_LEN_CCMP(16)

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 26cc57e7ccd13fa971df76f23653eab23215f327..22cb642915e2bbefe7f2b64bd6a1ff375da9768b 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -182,7 +182,7 @@ static void s_vFillTxKey(struct vnt_usb_send_context *tx_context,
 {
        struct vnt_private *pDevice = tx_context->priv;
        struct ieee80211_hdr *pMACHeader = tx_context->hdr;
-       u8 *pbyBuf = (u8 *)&fifo_head->adwTxKey[0];
+       u8 *pbyBuf = fifo_head->tx_key;
        __le32 *pdwIV = (__le32 *)pbyIVHead;
        __le32 *pdwExtIV = (__le32 *)((u8 *)pbyIVHead + 4);
        __le32 rev_iv_counter;
@@ -1404,7 +1404,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
        pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0];
     cbFrameBodySize = pPacket->cbPayloadLen;
        pTxBufHead = &pTX_Buffer->fifo_head;
-       pbyTxBufferAddr = (u8 *)&pTxBufHead->adwTxKey[0];
+       pbyTxBufferAddr = (u8 *)pTxBufHead;
        wTxBufSize = sizeof(struct vnt_tx_fifo_head);
 
 

diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 30e14379688d140e1100e861ebac14dd3058b9c2..95a4e2c6aa69d57718c497a8a2247b1e08805915 100644 (file)
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -219,7 +219,7 @@ union vnt_tx_head {
 };
 
 struct vnt_tx_fifo_head {
-       u32 adwTxKey[4];
+       u8 tx_key[WLAN_KEY_LEN_CCMP];
        u16 wFIFOCtl;
        __le16 time_stamp;
        u16 wFragCtl;