X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/49005895c94156692d93538ec0e275fbdafcf02b..15cf44dc52d2ee08c919734b3101062396e823fe:/target/linux/package/wlcompat/wlcompat.c?ds=sidebyside

diff --git a/target/linux/package/wlcompat/wlcompat.c b/target/linux/package/wlcompat/wlcompat.c
index 652a3681b..037d9ce0f 100644
--- a/target/linux/package/wlcompat/wlcompat.c
+++ b/target/linux/package/wlcompat/wlcompat.c
@@ -412,8 +412,7 @@ static int wlcompat_ioctl(struct net_device *dev,
 		{
 			int radio;
 
-			if (wl_ioctl(dev, WLC_GET_RADIO, &radio, sizeof(int)) < 0)
-				return -EINVAL;
+			wl_ioctl(dev, WLC_GET_RADIO, &radio, sizeof(int));
 			
 			if (wl_get_val(dev, "qtxpower", &(wrqu->txpower.value), sizeof(int)) < 0)
 				return -EINVAL;
@@ -431,10 +430,9 @@ static int wlcompat_ioctl(struct net_device *dev,
 			/* This is weird: WLC_SET_RADIO with 1 as argument disables the radio */
 			int radio = wrqu->txpower.disabled;
 
-			if (wl_ioctl(dev, WLC_SET_RADIO, &radio, sizeof(int)) < 0)
-				return -EINVAL;
+			wl_ioctl(dev, WLC_SET_RADIO, &radio, sizeof(int));
 			
-			if (!wrqu->txpower.disabled) {
+			if (!wrqu->txpower.disabled && (wrqu->txpower.value > 0)) {
 				int value;
 				
 				if (wl_get_val(dev, "qtxpower", &value, sizeof(int)) < 0)
@@ -461,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;
@@ -481,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: