staging: vt6656: revert : 64 bit- Correctly address void structure.
authorMalcolm Priestley <tvboxspy@gmail.com>
Tue, 22 Jan 2013 20:12:34 +0000 (20:12 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Feb 2013 13:38:37 +0000 (05:38 -0800)
commit d61ac98a4bd86b3217f0c6e058bd0b3a3282899b upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c

index 83c04e1..9213d69 100644 (file)
@@ -1454,7 +1454,7 @@ s_bPacketToWirelessUsb(
 
     pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;
        if (bNeedEncryption && pTransmitKey->pvKeyTable) {
-               if (((PSKeyTable)&pTransmitKey->pvKeyTable)->bSoftWEP == TRUE)
+               if (((PSKeyTable)pTransmitKey->pvKeyTable)->bSoftWEP == TRUE)
                        bSoftWEP = TRUE; /* WEP 256 */
        }