From 1db043901ede5927631e98c19702212918c62dc7 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 16 Jul 2005 16:38:44 +0000 Subject: fix iwconfig eth1 enc on/off git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1466 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/package/wlcompat/wlcompat.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'target/linux/package/wlcompat/wlcompat.c') diff --git a/target/linux/package/wlcompat/wlcompat.c b/target/linux/package/wlcompat/wlcompat.c index e96c867923..037d9ce0f8 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: -- cgit v1.2.3