diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-31 13:35:00 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 15:58:22 -0700 |
commit | ab51f51b6e4f307a0f8e1ce67f4fa1b57cb61892 (patch) | |
tree | 2fcc73cb7fe9f0e8f182f93b85dbf6e0b8dc6bc6 /drivers/staging/vt6656 | |
parent | 3695c46c7fa88f9f846510ffb44006de2edfb8b3 (diff) | |
download | op-kernel-dev-ab51f51b6e4f307a0f8e1ce67f4fa1b57cb61892.zip op-kernel-dev-ab51f51b6e4f307a0f8e1ce67f4fa1b57cb61892.tar.gz |
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>
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 4 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 26cc57e..22cb642 100644 --- 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 30e1437..95a4e2c 100644 --- 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; |