X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/70701dc6c83fcc594fc1e06a84b3cac57cc27fd4..75fdc587433434caa8eee27cd344bafd2ca1fd86:/package/openwrt/wlcompat.c

diff --git a/package/openwrt/wlcompat.c b/package/openwrt/wlcompat.c
index b6a9c20b7..d010e2bc8 100644
--- a/package/openwrt/wlcompat.c
+++ b/package/openwrt/wlcompat.c
@@ -31,8 +31,7 @@
 
 #include <net/iw_handler.h>
 #include <wlioctl.h>
-
-#define DEBUG
+#include <wlcompat.h>
 
 static struct net_device *dev;
 char buf[WLC_IOCTL_MAXLEN];
@@ -44,6 +43,13 @@ const long channel_frequency[] = {
 };
 #define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )
 
+
+
+static int wlcompat_private_ioctl(struct net_device *dev,
+			 struct iw_request_info *info,
+			 union iwreq_data *wrqu,
+			 char *extra);
+
 static int wl_ioctl(struct net_device *dev, int cmd, void *buf, int len)
 {
 	mm_segment_t old_fs = get_fs();
@@ -61,6 +67,50 @@ static int wl_ioctl(struct net_device *dev, int cmd, void *buf, int len)
 	return ret;
 }
 
+static int wl_set_val(struct net_device *dev, char *var, void *val, int len)
+{
+	char buf[128];
+	int buf_len;
+
+	/* check for overflow */
+	if ((buf_len = strlen(var)) + 1 + len > sizeof(buf))
+		return -1;
+	
+	strcpy(buf, var);
+	buf_len += 1;
+
+	/* append int value onto the end of the name string */
+	memcpy(&buf[buf_len], val, len);
+	buf_len += len;
+
+	return wl_ioctl(dev, WLC_SET_VAR, buf, buf_len);
+}
+
+static int wl_get_val(struct net_device *dev, char *var, void *val, int len)
+{
+	char buf[128];
+	int ret;
+
+	/* check for overflow */
+	if (strlen(var) + 1 > sizeof(buf) || len > sizeof(buf))
+		return -1;
+	
+	strcpy(buf, var);
+	if ((ret = wl_ioctl(dev, WLC_GET_VAR, buf, sizeof(buf))))
+		return ret;
+
+	memcpy(val, buf, len);
+	return 0;
+}
+
+int read_shmem(struct net_device *dev, int offset)
+{
+	if (wl_ioctl(dev, WLC_GET_SHMEM, &offset, sizeof(offset)) < 0)
+		return -EINVAL;
+
+	return offset;
+}
+
 static int wlcompat_ioctl_getiwrange(struct net_device *dev,
 				    char *extra)
 {
@@ -262,6 +312,21 @@ static int wlcompat_ioctl(struct net_device *dev,
 			}
 			break;
 		}
+		case SIOCSIWAP:
+		{
+			int ap = 0;
+			
+			if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
+				return -EINVAL;
+
+			if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
+				return -EINVAL;
+			
+			if (wl_ioctl(dev, (ap ? WLC_SET_BSSID : WLC_REASSOC), wrqu->ap_addr.sa_data, 6) < 0)
+				return -EINVAL;
+
+			break;
+		}
 		case SIOCGIWAP:
 		{
 			wrqu->ap_addr.sa_family = ARPHRD_ETHER;
@@ -319,9 +384,11 @@ static int wlcompat_ioctl(struct net_device *dev,
 		}
 		case SIOCGIWTXPOW:
 		{
-			wrqu->txpower.value = 0;
-			if (wl_ioctl(dev,WLC_GET_TXPWR, &(wrqu->txpower.value), sizeof(int)) < 0)
+			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.flags = IW_TXPOW_MWATT;
@@ -329,15 +396,59 @@ static int wlcompat_ioctl(struct net_device *dev,
 		}
 		case SIOCSIWTXPOW:
 		{
+			int override;
+			
+			if (wl_get_val(dev, "qtxpower", &override, sizeof(int)) < 0)
+				return -EINVAL;
+			
+			wrqu->txpower.value |= override & WL_TXPWR_OVERRIDE;
+			
 			if (wrqu->txpower.flags != IW_TXPOW_MWATT)
 				return -EINVAL;
 
-			if (wl_ioctl(dev, WLC_SET_TXPWR, &wrqu->txpower.value, sizeof(int)) < 0)
+			if (wl_set_val(dev, "qtxpower", &wrqu->txpower.value, sizeof(int)) < 0)
 				return -EINVAL;
 		}
 		case SIOCGIWENCODE:
 		{
-			wrqu->data.flags = IW_ENCODE_DISABLED;
+			int val;
+			
+			if (wl_ioctl(dev, WLC_GET_WEP, &val, sizeof(val)) < 0)
+				return -EINVAL;
+			
+
+			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;
+				}
+				
+				wrqu->data.flags = IW_ENCODE_ENABLED;
+				if (key-- > 0) {
+					int magic_offset;
+					int16 buffer[8];
+					
+					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);
+					}
+					
+					memset(extra, 0, 16);
+					memcpy(extra, buffer, 16);
+				} else {
+					wrqu->data.flags |= IW_ENCODE_NOKEY;
+				}
+			} else {
+				wrqu->data.flags = IW_ENCODE_DISABLED;
+			}
+			
 			break;
 		}
 		case SIOCGIWRANGE:
@@ -422,6 +533,9 @@ static int wlcompat_ioctl(struct net_device *dev,
 		}
 		default:
 		{
+			if (info->cmd >= SIOCIWFIRSTPRIV)
+				return wlcompat_private_ioctl(dev, info, wrqu, extra);
+
 			return -EINVAL;
 		}
 	}
@@ -450,7 +564,7 @@ static const iw_handler	 wlcompat_handler[] = {
 	iw_handler_get_spy,	/* SIOCGIWSPY */
 	iw_handler_set_thrspy,  /* SIOCSIWTHRSPY */
 	iw_handler_get_thrspy,  /* SIOCGIWTHRSPY */
-	NULL,			/* SIOCSIWAP */
+	wlcompat_ioctl,		/* SIOCSIWAP */
 	wlcompat_ioctl,		/* SIOCGIWAP */
 	NULL,			/* -- hole -- */
 	NULL,			/* SIOCGIWAPLIST */
@@ -476,43 +590,221 @@ static const iw_handler	 wlcompat_handler[] = {
 	wlcompat_ioctl,		/* SIOCGIWENCODE */
 };
 
-static const struct iw_handler_def      wlcompat_handler_def =
+static int wlcompat_private_ioctl(struct net_device *dev,
+			 struct iw_request_info *info,
+			 union iwreq_data *wrqu,
+			 char *extra)
+{
+	int *value = (int *) wrqu->name;
+
+	switch (info->cmd) {
+		case WLCOMPAT_SET_MONITOR:
+		{
+			if (wl_ioctl(dev, WLC_SET_MONITOR, value, sizeof(int)) < 0)
+				return -EINVAL;
+
+			break;
+		}
+		case WLCOMPAT_GET_MONITOR:
+		{
+			if (wl_ioctl(dev, WLC_GET_MONITOR, extra, sizeof(int)) < 0)
+				return -EINVAL;
+
+			break;
+		}
+		case WLCOMPAT_SET_TXPWR_LIMIT:
+		{
+			int val;
+			
+
+			if (wl_get_val(dev, "qtxpower", &val, sizeof(int)) < 0)
+				return -EINVAL;
+			
+			if (*extra > 0)
+				val |= WL_TXPWR_OVERRIDE;
+			else
+				val &= ~WL_TXPWR_OVERRIDE;
+			
+			if (wl_set_val(dev, "qtxpower", &val, sizeof(int)) < 0)
+				return -EINVAL;
+			
+			break;
+		}
+		case WLCOMPAT_GET_TXPWR_LIMIT:
+		{
+			if (wl_get_val(dev, "qtxpower", value, sizeof(int)) < 0)
+				return -EINVAL;
+
+			*value = ((*value & WL_TXPWR_OVERRIDE) == WL_TXPWR_OVERRIDE ? 1 : 0);
+
+			break;
+		}
+		case WLCOMPAT_SET_ANTDIV:
+		{
+			if (wl_ioctl(dev, WLC_SET_ANTDIV, value, sizeof(int)) < 0)
+				return -EINVAL;
+
+			break;
+		}
+		case WLCOMPAT_GET_ANTDIV:
+		{
+			if (wl_ioctl(dev, WLC_GET_ANTDIV, extra, sizeof(int)) < 0)
+				return -EINVAL;
+
+			break;
+		}
+		case WLCOMPAT_SET_TXANT:
+		{
+			if (wl_ioctl(dev, WLC_SET_TXANT, value, sizeof(int)) < 0)
+				return -EINVAL;
+
+			break;
+		}
+		case WLCOMPAT_GET_TXANT:
+		{
+			if (wl_ioctl(dev, WLC_GET_TXANT, extra, sizeof(int)) < 0)
+				return -EINVAL;
+
+			break;
+		}
+		default:
+		{
+			return -EINVAL;
+		}
+			
+	}
+	return 0;
+}
+
+static const struct iw_priv_args wlcompat_private_args[] = 
+{
+	{	WLCOMPAT_SET_MONITOR, 
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		0,
+		"set_monitor"
+	},
+	{	WLCOMPAT_GET_MONITOR, 
+		0,
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		"get_monitor"
+	},
+	{	WLCOMPAT_SET_TXPWR_LIMIT, 
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		0,
+		"set_txpwr_force"
+	},
+	{	WLCOMPAT_GET_TXPWR_LIMIT, 
+		0,
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		"get_txpwr_force"
+	},
+	{	WLCOMPAT_SET_ANTDIV, 
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		0,
+		"set_antdiv"
+	},
+	{	WLCOMPAT_GET_ANTDIV, 
+		0,
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		"get_antdiv"
+	},
+	{	WLCOMPAT_SET_TXANT, 
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		0,
+		"set_txant"
+	},
+	{	WLCOMPAT_GET_TXANT, 
+		0,
+		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		"get_txant"
+	},
+};
+
+static const iw_handler wlcompat_private[] =
+{
+	wlcompat_private_ioctl,
+	NULL
+};
+
+
+static const struct iw_handler_def wlcompat_handler_def =
 {
 	.standard	= (iw_handler *) wlcompat_handler,
 	.num_standard	= sizeof(wlcompat_handler)/sizeof(iw_handler),
-	.private	= NULL,
-	.num_private	= 0,
-	.private_args	= NULL, 
-	.num_private_args = 0,
+	.private	= wlcompat_private,
+	.num_private	= 1,
+	.private_args	= wlcompat_private_args,
+	.num_private_args = sizeof(wlcompat_private_args) / sizeof(wlcompat_private_args[0])
 };
 
+
 #ifdef DEBUG
+void print_buffer(int len, unsigned char *buf) {
+	int x;
+	if (buf != NULL) {
+		for (x=0;x<len && x<180 ;x++) {
+			if ((x % 4) == 0)
+				printk(" ");
+			printk("%02X",buf[x]);
+		}
+	} else {
+		printk(" NULL");
+	}
+	printk("\n");
+
+}
+#endif
 static int (*old_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);
 static int new_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) {
-	int ret = old_ioctl(dev,ifr,cmd);
+	int ret = 0;
+	struct iwreq *iwr = (struct iwreq *) ifr;
+	struct iw_request_info info;
+	
+#ifdef DEBUG
 	printk("dev: %s ioctl: 0x%04x\n",dev->name,cmd);
-	if (cmd==SIOCDEVPRIVATE) {
-		int x;
+#endif
+
+	if (cmd >= SIOCIWFIRSTPRIV) {
+		info.cmd = cmd;
+		info.flags = 0;
+		ret = wlcompat_private_ioctl(dev, &info, &(iwr->u), (char *) &(iwr->u));
+#ifdef DEBUG
+	} else if (cmd==SIOCDEVPRIVATE) {
 		wl_ioctl_t *ioc = (wl_ioctl_t *)ifr->ifr_data;
 		unsigned char *buf = ioc->buf;
 		printk("   cmd: %d buf: 0x%08x len: %d\n",ioc->cmd,&(ioc->buf),ioc->len);
-		printk("   ->");
-		for (x=0;x<ioc->len && x<128 ;x++) {
-			printk("%02X",buf[x]);
-		}
-		printk("\n");
+		printk("   send: ->");
+		print_buffer(ioc->len, buf);
+		ret = old_ioctl(dev,ifr,cmd);
+		printk("   recv: ->");
+		print_buffer(ioc->len, buf);
+		printk("   ret: %d\n", ret);
+#endif
+	} else {
+		ret = old_ioctl(dev,ifr,cmd);
 	}
 	return ret;
 }
-#endif
 
 static int __init wlcompat_init()
 {
-	dev = dev_get_by_name("eth1");
-#ifdef DEBUG
+	int found = 0, i;
+	char *devname = "eth0";
+	
+	while (!found && (dev = dev_get_by_name(devname))) {
+		if ((dev->wireless_handlers == NULL) && ((wl_ioctl(dev, WLC_GET_MAGIC, &i, sizeof(i)) == 0) && i == WLC_IOCTL_MAGIC))
+			found = 1;
+		devname[3]++;
+	}
+	
+	if (!found) {
+		printk("No Broadcom devices found.\n");
+		return -ENODEV;
+	}
+		
+
 	old_ioctl = dev->do_ioctl;
 	dev->do_ioctl = new_ioctl;
-#endif
 	dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
 	return 0;
 }
@@ -520,9 +812,7 @@ static int __init wlcompat_init()
 static void __exit wlcompat_exit()
 {
 	dev->wireless_handlers = NULL;
-#ifdef DEBUG
 	dev->do_ioctl = old_ioctl;
-#endif
 	return;
 }