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

staging: vt6656: rxtx replace adwTxKey[4]

Replace with tx_key with size of WLAN_KEY_LEN_CCMP(16)
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3695c46c
...@@ -182,7 +182,7 @@ static void s_vFillTxKey(struct vnt_usb_send_context *tx_context, ...@@ -182,7 +182,7 @@ static void s_vFillTxKey(struct vnt_usb_send_context *tx_context,
{ {
struct vnt_private *pDevice = tx_context->priv; struct vnt_private *pDevice = tx_context->priv;
struct ieee80211_hdr *pMACHeader = tx_context->hdr; 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 *pdwIV = (__le32 *)pbyIVHead;
__le32 *pdwExtIV = (__le32 *)((u8 *)pbyIVHead + 4); __le32 *pdwExtIV = (__le32 *)((u8 *)pbyIVHead + 4);
__le32 rev_iv_counter; __le32 rev_iv_counter;
...@@ -1404,7 +1404,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, ...@@ -1404,7 +1404,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0]; pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0];
cbFrameBodySize = pPacket->cbPayloadLen; cbFrameBodySize = pPacket->cbPayloadLen;
pTxBufHead = &pTX_Buffer->fifo_head; pTxBufHead = &pTX_Buffer->fifo_head;
pbyTxBufferAddr = (u8 *)&pTxBufHead->adwTxKey[0]; pbyTxBufferAddr = (u8 *)pTxBufHead;
wTxBufSize = sizeof(struct vnt_tx_fifo_head); wTxBufSize = sizeof(struct vnt_tx_fifo_head);
......
...@@ -219,7 +219,7 @@ union vnt_tx_head { ...@@ -219,7 +219,7 @@ union vnt_tx_head {
}; };
struct vnt_tx_fifo_head { struct vnt_tx_fifo_head {
u32 adwTxKey[4]; u8 tx_key[WLAN_KEY_LEN_CCMP];
u16 wFIFOCtl; u16 wFIFOCtl;
__le16 time_stamp; __le16 time_stamp;
u16 wFragCtl; u16 wFragCtl;
......
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