diff options
| author | Malcolm Priestley | 2013-01-22 21:13:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-25 20:21:26 +0100 |
| commit | 392c6ff87f568d573239b763855160d1f06114de (patch) | |
| tree | bd51b0bf719e5dbd3a14adbdd1c6c30980425284 /drivers/staging/vt6656/dpc.c | |
| parent | staging: vt6656: revert : 64 bit- Correctly address void structure. (diff) | |
| download | kernel-qcow2-linux-392c6ff87f568d573239b763855160d1f06114de.tar.gz kernel-qcow2-linux-392c6ff87f568d573239b763855160d1f06114de.tar.xz kernel-qcow2-linux-392c6ff87f568d573239b763855160d1f06114de.zip | |
staging: vt6656: Revert: 64bit fixes: dpc.c incorrect addressing of void structure.
The patch was totally wrong and is reverted.
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>
Cc: stable@vger.kernel.org # 3.8
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/dpc.c')
| -rw-r--r-- | drivers/staging/vt6656/dpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 6c981722b88b..208be2c4abcb 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -1116,7 +1116,7 @@ static int s_bHandleRxEncryption(struct vnt_private *pDevice, u8 *pbyFrame, if (byDecMode == KEY_CTL_WEP) { // handle WEP if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || - (((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE)) { + (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE)) { // Software WEP // 1. 3253A // 2. WEP 256 @@ -1213,7 +1213,7 @@ static int s_bHostWepRxEncryption(struct vnt_private *pDevice, u8 *pbyFrame, // handle WEP DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP\n"); if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || - (((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE) || + (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE) || (bOnFly == FALSE)) { // Software WEP // 1. 3253A |