diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2013-01-22 20:12:34 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-28 05:38:37 -0800 |
| commit | 7b12be8563b3d5ebf121dd37227de37bf68123b0 (patch) | |
| tree | 7e00214ef94804f123f2a8968ffe57283f37e8cb | |
| parent | c82585afa07a05f8e2ed9c9fad5ca95a1ccfd8af (diff) | |
| download | lwn-7b12be8563b3d5ebf121dd37227de37bf68123b0.tar.gz lwn-7b12be8563b3d5ebf121dd37227de37bf68123b0.zip | |
staging: vt6656: revert : 64 bit- Correctly address void structure.
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>
| -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 83c04e120935..9213d69c5861 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -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 */ } |