X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a847319981721965bcfa208ed2c68c712719df1f..5b23b36b7c0d9beb9335c7351e656426b6e85610:/openwrt/target/linux/package/wlcompat/wlcompat.c

diff --git a/openwrt/target/linux/package/wlcompat/wlcompat.c b/openwrt/target/linux/package/wlcompat/wlcompat.c
index d499d7955..037d9ce0f 100644
--- a/openwrt/target/linux/package/wlcompat/wlcompat.c
+++ b/openwrt/target/linux/package/wlcompat/wlcompat.c
@@ -83,6 +83,7 @@ static int wl_set_val(struct net_device *dev, char *var, void *val, int len)
 {
 	char buf[128];
 	int buf_len;
+	int ret;
 
 	/* check for overflow */
 	if ((buf_len = strlen(var)) + 1 + len > sizeof(buf))
@@ -92,23 +93,25 @@ static int wl_set_val(struct net_device *dev, char *var, void *val, int len)
 	buf_len += 1;
 
 	/* append int value onto the end of the name string */
-	memcpy(&buf[buf_len], val, len);
+	memcpy(&(buf[buf_len]), val, len);
 	buf_len += len;
 
-	return wl_ioctl(dev, WLC_SET_VAR, buf, buf_len);
+	ret = wl_ioctl(dev, WLC_SET_VAR, buf, buf_len);
+	return ret;
 }
 
 static int wl_get_val(struct net_device *dev, char *var, void *val, int len)
 {
 	char buf[128];
+	int buf_len;
 	int ret;
 
 	/* check for overflow */
-	if (strlen(var) + 1 > sizeof(buf) || len > sizeof(buf))
+	if ((buf_len = strlen(var)) + 1 > sizeof(buf) || len > sizeof(buf))
 		return -1;
 	
 	strcpy(buf, var);
-	if ((ret = wl_ioctl(dev, WLC_GET_VAR, buf, sizeof(buf))))
+	if (ret = wl_ioctl(dev, WLC_GET_VAR, buf, buf_len + len))
 		return ret;
 
 	memcpy(val, buf, len);
@@ -173,7 +176,7 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
 	if (wl_ioctl(dev, WLC_GET_FRAG, &range->max_frag, sizeof(int)) < 0)
 		range->max_frag = 2346;
 
-	range->txpower_capa = IW_TXPOW_MWATT;
+	range->txpower_capa = IW_TXPOW_DBM;
 
 	return 0;
 }
@@ -309,23 +312,29 @@ static int wlcompat_ioctl(struct net_device *dev,
 		}
 		case SIOCSIWFREQ:
 		{
-			if (wrqu->freq.e == 1) {
-				int channel = 0;
-				int f = wrqu->freq.m / 100000;
-				while ((channel < NUM_CHANNELS + 1) && (f != channel_frequency[channel]))
-					channel++;
-				
-				if (channel == NUM_CHANNELS) // channel not found
-					return -EINVAL;
-
-				wrqu->freq.e = 0;
-				wrqu->freq.m = channel + 1;
-			}
-			if ((wrqu->freq.e == 0) && (wrqu->freq.m < 1000)) {
+			if (wrqu->freq.m == -1) {
+				wrqu->freq.m = 0;
 				if (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
 					return -EINVAL;
 			} else {
-				return -EINVAL;
+				if (wrqu->freq.e == 1) {
+					int channel = 0;
+					int f = wrqu->freq.m / 100000;
+					while ((channel < NUM_CHANNELS + 1) && (f != channel_frequency[channel]))
+						channel++;
+					
+					if (channel == NUM_CHANNELS) // channel not found
+						return -EINVAL;
+
+					wrqu->freq.e = 0;
+					wrqu->freq.m = channel + 1;
+				}
+				if ((wrqu->freq.e == 0) && (wrqu->freq.m < 1000)) {
+					if (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
+						return -EINVAL;
+				} else {
+					return -EINVAL;
+				}
 			}
 			break;
 		}
@@ -403,17 +412,17 @@ 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;
 			
 			wrqu->txpower.value &= ~WL_TXPWR_OVERRIDE;
+			wrqu->txpower.value /= 4;
 				
 			wrqu->txpower.fixed = 0;
 			wrqu->txpower.disabled = radio;
-			wrqu->txpower.flags = IW_TXPOW_MWATT;
+			wrqu->txpower.flags = IW_TXPOW_DBM;
 			break;
 		}
 		case SIOCSIWTXPOW:
@@ -421,35 +430,44 @@ 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) {
-				int override;
-
-				if (wl_get_val(dev, "qtxpower", &override, sizeof(int)) < 0)
+			if (!wrqu->txpower.disabled && (wrqu->txpower.value > 0)) {
+				int value;
+				
+				if (wl_get_val(dev, "qtxpower", &value, sizeof(int)) < 0)
 					return -EINVAL;
 				
-				wrqu->txpower.value |= override & WL_TXPWR_OVERRIDE;
+				value &= WL_TXPWR_OVERRIDE;
+				wrqu->txpower.value *= 4;
+				wrqu->txpower.value |= value;
 				
-				if (wrqu->txpower.flags != IW_TXPOW_MWATT)
-					return -EINVAL;
-
-				if (wl_set_val(dev, "qtxpower", &wrqu->txpower.value, sizeof(int)) < 0)
+				if (wrqu->txpower.flags != IW_TXPOW_DBM)
 					return -EINVAL;
-
+				
+				if (wrqu->txpower.value > 0)
+					if (wl_set_val(dev, "qtxpower", &(wrqu->txpower.value), sizeof(int)) < 0)
+						return -EINVAL;
 			}
+			break;
 		}
 		case SIOCSIWENCODE:
 		{
-			int wep = 1, wrestrict = 1;
+			int val = 0, wep = 1, wrestrict = 1;
 			int index = (wrqu->data.flags & IW_ENCODE_INDEX) - 1;
 
 			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;
@@ -468,15 +486,12 @@ 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_SET_WSEC, &wep, sizeof(wep)) < 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:
 		{