[PATCH 23/33] Staging: rt28x0: rt_ioctl_siwencode() fixes
Bartlomiej Zolnierkiewicz
bzolnier at gmail.com
Sun Aug 23 13:31:15 UTC 2009
From: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Subject: [PATCH] Staging: rt28x0: rt_ioctl_siwencode() fixes
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
---
drivers/staging/rt2860/sta_ioctl.c | 10 ----------
1 file changed, 10 deletions(-)
Index: b/drivers/staging/rt2860/sta_ioctl.c
===================================================================
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -1425,9 +1425,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;
@@ -1438,9 +1435,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)
@@ -1459,12 +1453,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);
More information about the devel
mailing list