Patchwork [upstream,for,stable,2/8] staging: vt6656: 64 bit- Correctly address void structure.

login
register
mail settings
Submitter Malcolm Priestley
Date Dec. 27, 2012, 1:01 p.m.
Message ID <1356613267.3447.38.camel@canaries64>
Download mbox | patch
Permalink /patch/209017/
State New
Headers show

Comments

Malcolm Priestley - Dec. 27, 2012, 1:01 p.m.
upstream 
commit e2efba763b472835fdface597fe2216b3403967e

Tested on kernels 2.6.35, 3.0, 3.2, 3.5 & 3.7

staging: vt6656: 64 bit- Correctly address void structure.
    
Fixes 64 bit deadlock on successful association.

Cc: stable@kernel.org  # 2.6.35+
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Patch

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));