summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-07-16 16:38:44 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-07-16 16:38:44 +0000
commit4f99f44bbdb078af94ddcf5ef97cd2a96000e78e (patch)
tree4468637501f874a454c67230b760890776423709
parent076ab085b620dd0c21084c74a7fe91b4659713e0 (diff)
fix iwconfig eth1 enc on/off
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1466 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/package/wlcompat/wlcompat.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/package/wlcompat/wlcompat.c b/target/linux/package/wlcompat/wlcompat.c
index e96c86792..037d9ce0f 100644
--- a/target/linux/package/wlcompat/wlcompat.c
+++ b/target/linux/package/wlcompat/wlcompat.c
@@ -459,8 +459,15 @@ static int wlcompat_ioctl(struct net_device *dev,
if (index < 0)
index = get_primary_key(dev);
- if (wrqu->data.flags & IW_ENCODE_DISABLED)
+ if (wrqu->data.flags & IW_ENCODE_DISABLED) {
wep = 0;
+ if (wl_ioctl(dev, WLC_SET_WSEC, &wep, sizeof(val)) < 0)
+ return -EINVAL;
+ return 0;
+ }
+
+ if (wl_ioctl(dev, WLC_SET_WSEC, &wep, sizeof(val)) < 0)
+ return -EINVAL;
if (wrqu->data.flags & IW_ENCODE_OPEN)
wrestrict = 0;
@@ -479,18 +486,11 @@ static int wlcompat_ioctl(struct net_device *dev,
}
if (index >= 0)
- if (wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index)) < 0)
- return -EINVAL;
+ wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index));
- if (wl_ioctl(dev, WLC_GET_WSEC, &val, sizeof(val)) < 0)
- return -EINVAL;
- val |= wep;
- if (wl_ioctl(dev, WLC_SET_WSEC, &val, sizeof(val)) < 0)
- return -EINVAL;
-
if (wrestrict >= 0)
- if (wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict)) < 0)
- return -EINVAL;
+ wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict));
+
break;
}
case SIOCGIWENCODE: