diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-16 16:38:44 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-16 16:38:44 +0000 |
| commit | 57176eb320346e84df58b87aa59e00ec0c0e2367 (patch) | |
| tree | 23ccb3a551671efb132910b74199a235ad872637 | |
| parent | fb1291ca4ce7a426e880dd4d00cede61bd109338 (diff) | |
fix iwconfig eth1 enc on/off
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1466 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/target/linux/package/wlcompat/wlcompat.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/openwrt/target/linux/package/wlcompat/wlcompat.c b/openwrt/target/linux/package/wlcompat/wlcompat.c index e96c86792..037d9ce0f 100644 --- a/openwrt/target/linux/package/wlcompat/wlcompat.c +++ b/openwrt/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: |