diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2013-01-22 15:12:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 14:21:26 -0500 |
commit | d61ac98a4bd86b3217f0c6e058bd0b3a3282899b (patch) | |
tree | 968a936a52e230976be8312953d07a8fe601dd9b /drivers/staging | |
parent | 8e404fffeac7d3985b193edbf860d9d73dec5b6a (diff) |
staging: vt6656: revert : 64 bit- Correctly address void structure.
The patch is wrong and is partially reverted.
The NULL check of pTransmitKey->pvKeyTable is kept.
The problem was ultimately fixed by upstream commit.
1ee4c55fc9620451b2a825d793042a7e0775391b
staging: vt6656: Fix inconsistent structure packing
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Cc: stable@vger.kernel.org # 3.8
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 536d31444656..92343f2a2648 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c | |||
@@ -1232,7 +1232,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, | |||
1232 | pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL; | 1232 | pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL; |
1233 | 1233 | ||
1234 | if (bNeedEncryption && pTransmitKey->pvKeyTable) { | 1234 | if (bNeedEncryption && pTransmitKey->pvKeyTable) { |
1235 | if (((PSKeyTable)&pTransmitKey->pvKeyTable)->bSoftWEP == TRUE) | 1235 | if (((PSKeyTable)pTransmitKey->pvKeyTable)->bSoftWEP == TRUE) |
1236 | bSoftWEP = TRUE; /* WEP 256 */ | 1236 | bSoftWEP = TRUE; /* WEP 256 */ |
1237 | } | 1237 | } |
1238 | 1238 | ||