diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2012-11-11 15:20:52 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-13 20:51:30 (GMT) |
| commit | e2efba763b472835fdface597fe2216b3403967e (patch) | |
| tree | f1a39304530db5ecb7d4662469fdbdbfe4b74422 /drivers | |
| parent | 04212268286249b65e589c4d3bbf3760c2ac504d (diff) | |
| download | linux-e2efba763b472835fdface597fe2216b3403967e.tar.xz | |
staging: vt6656: 64 bit- Correctly address void structure.
Fixes 64 bit deadlock on successful association.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 0f35a9a..1f87213 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -1452,12 +1452,10 @@ s_bPacketToWirelessUsb( pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL; - if ((bNeedEncryption) && (pTransmitKey != NULL)) { - if (((PSKeyTable) (pTransmitKey->pvKeyTable))->bSoftWEP == TRUE) { - // WEP 256 - bSoftWEP = TRUE; - } - } + if (bNeedEncryption && pTransmitKey->pvKeyTable) { + if (((PSKeyTable)&pTransmitKey->pvKeyTable)->bSoftWEP == TRUE) + bSoftWEP = TRUE; /* WEP 256 */ + } pTxBufHead = (PTX_BUFFER) usbPacketBuf; memset(pTxBufHead, 0, sizeof(TX_BUFFER)); |