Commit d61ac98a authored Jan 22, 2013 by Malcolm Priestley Committed by Greg Kroah-Hartman Jan 25, 2013

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.
1ee4c55f
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>

parent 8e404fff

drivers/staging/vt6656/rxtx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1232,7 +1232,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
	pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;		pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;

	if (bNeedEncryption && pTransmitKey->pvKeyTable) {		if (bNeedEncryption && pTransmitKey->pvKeyTable) {
	if (((PSKeyTable)&pTransmitKey->pvKeyTable)->bSoftWEP == TRUE)		if (((PSKeyTable)pTransmitKey->pvKeyTable)->bSoftWEP == TRUE)
	bSoftWEP = TRUE; /* WEP 256 */		bSoftWEP = TRUE; /* WEP 256 */
	}		}