X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/76ed58d705e7f3892a1259abcd92882a527e7b53..d2e1864c77698f255ce7b725b204db513f79b688:/target/linux/package/wlcompat/wlcompat.c

diff --git a/target/linux/package/wlcompat/wlcompat.c b/target/linux/package/wlcompat/wlcompat.c
index d010e2bc8..1d2a36325 100644
--- a/target/linux/package/wlcompat/wlcompat.c
+++ b/target/linux/package/wlcompat/wlcompat.c
@@ -43,12 +43,24 @@ const long channel_frequency[] = {
 };
 #define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )
 
+typedef struct internal_wsec_key {
+	uint8 index;		// 0x00
+	uint8 unknown_1;	// 0x01
+	uint8 type;		// 0x02
+	uint8 unknown_2[7];	// 0x03
+	uint8 len;		// 0x0a
+	uint8 pad[3];
+	char data[32];		// 0x0e
+} wkey;
 
 
 static int wlcompat_private_ioctl(struct net_device *dev,
 			 struct iw_request_info *info,
 			 union iwreq_data *wrqu,
 			 char *extra);
+#ifdef DEBUG
+void print_buffer(int len, unsigned char *buf);
+#endif
 
 static int wl_ioctl(struct net_device *dev, int cmd, void *buf, int len)
 {
@@ -71,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))
@@ -80,37 +93,44 @@ 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);
 	return 0;
 }
 
-int read_shmem(struct net_device *dev, int offset)
+int get_primary_key(struct net_device *dev)
 {
-	if (wl_ioctl(dev, WLC_GET_SHMEM, &offset, sizeof(offset)) < 0)
-		return -EINVAL;
-
-	return offset;
+	int key, val;
+	
+	for (key = val = 0; (key < 4) && (val == 0); key++) {
+		val = key;
+		if (wl_ioctl(dev, WLC_GET_KEY_PRIMARY, &val, sizeof(val)) < 0)
+			return -EINVAL;
+	}
+	return key;
 }
 
+
 static int wlcompat_ioctl_getiwrange(struct net_device *dev,
 				    char *extra)
 {
@@ -292,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;
 		}
@@ -384,30 +410,88 @@ static int wlcompat_ioctl(struct net_device *dev,
 		}
 		case SIOCGIWTXPOW:
 		{
+			int radio;
+
+			if (wl_ioctl(dev, WLC_GET_RADIO, &radio, sizeof(int)) < 0)
+				return -EINVAL;
+			
 			if (wl_get_val(dev, "qtxpower", &(wrqu->txpower.value), sizeof(int)) < 0)
 				return -EINVAL;
 			
 			wrqu->txpower.value &= ~WL_TXPWR_OVERRIDE;
 				
 			wrqu->txpower.fixed = 0;
-			wrqu->txpower.disabled = 0;
+			wrqu->txpower.disabled = radio;
 			wrqu->txpower.flags = IW_TXPOW_MWATT;
 			break;
 		}
 		case SIOCSIWTXPOW:
 		{
-			int override;
-			
-			if (wl_get_val(dev, "qtxpower", &override, sizeof(int)) < 0)
+			/* 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;
 			
-			wrqu->txpower.value |= override & WL_TXPWR_OVERRIDE;
+			if (!wrqu->txpower.disabled) {
+				int value;
+				
+				if (wl_get_val(dev, "qtxpower", &value, sizeof(int)) < 0)
+					return -EINVAL;
+				
+				value &= WL_TXPWR_OVERRIDE;
+				wrqu->txpower.value |= value;
+				
+				if (wrqu->txpower.flags != IW_TXPOW_MWATT)
+					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 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->txpower.flags != IW_TXPOW_MWATT)
-				return -EINVAL;
+			if (wrqu->data.flags & IW_ENCODE_DISABLED)
+				wep = 0;
+
+			if (wrqu->data.flags & IW_ENCODE_OPEN)
+				wrestrict = 0;
+			
+			if (wrqu->data.pointer && (wrqu->data.length > 0) && (wrqu->data.length <= 16)) {
+				wl_wsec_key_t key;
+				memset(&key, 0, sizeof(key));
+
+				key.flags = WL_PRIMARY_KEY;
+				key.len = wrqu->data.length;
+				key.index = index;
+				memcpy(key.data, wrqu->data.pointer, wrqu->data.length);
 
-			if (wl_set_val(dev, "qtxpower", &wrqu->txpower.value, sizeof(int)) < 0)
+				if (wl_ioctl(dev, WLC_SET_KEY, &key, sizeof(key)) < 0)
+					return -EINVAL;
+			}
+
+			if (index >= 0)
+				if (wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index)) < 0)
+					return -EINVAL;
+			
+			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;
+			break;
 		}
 		case SIOCGIWENCODE:
 		{
@@ -418,30 +502,21 @@ static int wlcompat_ioctl(struct net_device *dev,
 			
 
 			if (val > 0) {
-				int key;
-				
-				for (key = val = 0; (key < 4) && (val == 0); key++) {
-					val = key;
-					if (wl_ioctl(dev, WLC_GET_KEY_PRIMARY, &val, sizeof(val)) < 0)
-						return -EINVAL;
-				}
+				int key = get_primary_key(dev);
 				
 				wrqu->data.flags = IW_ENCODE_ENABLED;
 				if (key-- > 0) {
-					int magic_offset;
-					int16 buffer[8];
+					int *info_addr; 
+					wkey *wep_key;
 					
-					magic_offset = read_shmem(dev, 0x56) * 2;
-
-					wrqu->data.flags |= key + 1;
-					wrqu->data.length = 16;
-					
-					for (val = 0; val < 8; val++) {
-						buffer[val] = read_shmem(dev, magic_offset + (key * 16) + val * 2);
-					}
+					info_addr = (int *) dev->priv;
+					wep_key = (wkey *) ((*info_addr) + 0x2752 + (key * 0x110));
 					
+					wrqu->data.flags |= key + 1;
+					wrqu->data.length = wep_key->len;
+
 					memset(extra, 0, 16);
-					memcpy(extra, buffer, 16);
+					memcpy(extra, wep_key->data, 16);
 				} else {
 					wrqu->data.flags |= IW_ENCODE_NOKEY;
 				}
@@ -481,22 +556,18 @@ static int wlcompat_ioctl(struct net_device *dev,
 					ap = 0;
 					wet = 1;
 					break;
+					
 				default:
 					return -EINVAL;
 			}
 			
-			if (wl_ioctl(dev, WLC_SET_PASSIVE, &passive, sizeof(passive)) < 0)
-				return -EINVAL;
-			if (wl_ioctl(dev, WLC_SET_MONITOR, &passive, sizeof(passive)) < 0)
-				return -EINVAL;
-			if (wl_ioctl(dev, WLC_SET_WET, &wet, sizeof(wet)) < 0)
-				return -EINVAL;
-			if (ap >= 0)
-				if (wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap)) < 0)
-					return -EINVAL;
+			wl_ioctl(dev, WLC_SET_PASSIVE, &passive, sizeof(passive));
+			wl_ioctl(dev, WLC_SET_MONITOR, &passive, sizeof(passive));
+			wl_ioctl(dev, WLC_SET_WET, &wet, sizeof(wet));
+			if (ap >= 0) 
+				wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap));
 			if (infra >= 0)
-				if (wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra)) < 0)
-					return -EINVAL;
+				wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra));
 
 			break;
 						
@@ -586,7 +657,7 @@ static const iw_handler	 wlcompat_handler[] = {
 	wlcompat_ioctl,		/* SIOCGIWTXPOW */
 	NULL,			/* SIOCSIWRETRY */
 	NULL,			/* SIOCGIWRETRY */
-	NULL,			/* SIOCSIWENCODE */
+	wlcompat_ioctl,		/* SIOCSIWENCODE */
 	wlcompat_ioctl,		/* SIOCGIWENCODE */
 };
 
@@ -806,6 +877,9 @@ static int __init wlcompat_init()
 	old_ioctl = dev->do_ioctl;
 	dev->do_ioctl = new_ioctl;
 	dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
+#ifdef DEBUG
+	printk("broadcom driver private data: 0x%08x\n", dev->priv);
+#endif
 	return 0;
 }