From bzolnier@gmail.com Tue Aug 25 22:22:54 2009 From: Bartlomiej Zolnierkiewicz Date: Sun, 23 Aug 2009 15:31:15 +0200 Subject: Staging: rt28x0: rt_ioctl_siwencode() fixes To: "Greg Kroah-Hartman" Cc: devel@driverdev.osuosl.org, Bartlomiej Zolnierkiewicz , Marcin Slusarz , Mike Galbraith , linux-kernel@vger.kernel.org Message-ID: <20090823133115.17784.35324.sendpatchset@localhost.localdomain> From: Bartlomiej Zolnierkiewicz Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rt2860/sta_ioctl.c | 10 ---------- 1 file changed, 10 deletions(-) --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c @@ -1437,9 +1437,6 @@ int rt_ioctl_siwencode(struct net_device 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 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 //Using default key keyIdx = pAdapter->StaCfg.DefaultKeyId; } -#ifdef RT30xx else - { pAdapter->StaCfg.DefaultKeyId=keyIdx; - } -#endif NdisZeroMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, 16);