From: Malcolm Priestley Date: Tue, 22 Jan 2013 20:12:34 +0000 (+0000) Subject: staging: vt6656: revert : 64 bit- Correctly address void structure. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d61ac98a4bd86b3217f0c6e058bd0b3a3282899b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: Malcolm Priestley Cc: stable@vger.kernel.org # 3.8 Signed-off-by: Greg Kroah-Hartman --- 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, 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 */ }