From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 16 Jul 2005 16:38:44 +0000 (+0000)
Subject: fix iwconfig eth1 enc on/off
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a9848f897675c4c8b026d358ac8f7023ab9d0cb;p=openwrt%2Fstaging%2Fnbd.git

fix iwconfig eth1 enc on/off

SVN-Revision: 1466
---

diff --git a/openwrt/target/linux/package/wlcompat/wlcompat.c b/openwrt/target/linux/package/wlcompat/wlcompat.c
index e96c867923..037d9ce0f8 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: