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

Commit 6e87be5d authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt28x0: rt_ioctl_siwencode() fixes 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a0f2906f

drivers/staging/rt2860/sta_ioctl.c

+0 −10
Original line number Diff line number Diff line
@@ -1437,9 +1437,6 @@ int rt_ioctl_siwencode(struct net_device *dev, 
        pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeOpen;

        goto done;

	} else if (

#ifndef RT30xx

		 erq->length == 0 &&

#endif

		 (erq->flags & IW_ENCODE_RESTRICTED || erq->flags & IW_ENCODE_OPEN)) {

		STA_PORT_SECURED(pAdapter);

		pAdapter->StaCfg.PairCipher = Ndis802_11WEPEnabled;
@@ -1450,9 +1447,6 @@ int rt_ioctl_siwencode(struct net_device *dev, 
			pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeShared;

    	else

			pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeOpen;

#ifndef RT30xx

        goto done;

#endif

	}



    if (erq->length > 0)
@@ -1471,12 +1465,8 @@ int rt_ioctl_siwencode(struct net_device *dev, 
            //Using default key

			keyIdx = pAdapter->StaCfg.DefaultKeyId;

        }

#ifdef RT30xx

		else

		{

			pAdapter->StaCfg.DefaultKeyId=keyIdx;

		}

#endif



        NdisZeroMemory(pAdapter->SharedKey[BSS0][keyIdx].Key,  16);