Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392c6ff8 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

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.
1ee4c55f
staging: vt6656: Fix inconsistent structure packing

Reported-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Cc: stable@vger.kernel.org # 3.8
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d61ac98a

drivers/staging/vt6656/dpc.c

+2 −2
Original line number Diff line number Diff line
@@ -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