aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860/sta_ioctl.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-08-23 15:31:15 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:22 -0700
commit6e87be5d6aefdebeb66115480dbdf0c7fa96dd28 (patch)
tree7bfaa8e76978f54447efaffb1b19d511a06182c3 /drivers/staging/rt2860/sta_ioctl.c
parenta0f2906f3385cfb84a6ec6b0c2c0c028dcc8cfde (diff)
Staging: rt28x0: rt_ioctl_siwencode() fixes
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/sta_ioctl.c')
-rw-r--r--drivers/staging/rt2860/sta_ioctl.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index a5aa6227ab4..881ed6c4a24 100644
--- 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 *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);