X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0674bcbcd8ca680c35ca75eeeb41128b4adea4d0..b9cb3d1ffb90e252be1aea19ca850a0573567a8b:/package/openwrt/wlcompat.c

diff --git a/package/openwrt/wlcompat.c b/package/openwrt/wlcompat.c
index cce64e7c5..53cedd8ba 100644
--- a/package/openwrt/wlcompat.c
+++ b/package/openwrt/wlcompat.c
@@ -71,9 +71,13 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
 	range->pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_UNICAST_R;
 
 	range->min_rts = 0;
-	range->max_rts = 2347;
+	if (wl_ioctl(dev, WLC_GET_RTS, &range->max_rts, sizeof(int)) < 0)
+		range->max_rts = 2347;
+
 	range->min_frag = 256;
-	range->max_frag = 2346;
+	
+	if (wl_ioctl(dev, WLC_GET_FRAG, &range->max_frag, sizeof(int)) < 0)
+		range->max_frag = 2346;
 
 	range->min_pmp = 0;
 	range->max_pmp = 65535000;
@@ -81,7 +85,7 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
 	range->max_pmt = 65535 * 1000;
 
 	range->txpower_capa = IW_TXPOW_MWATT;
-	
+
 	return 0;
 }
 
@@ -90,8 +94,6 @@ static int wlcompat_ioctl(struct net_device *dev,
 			 union iwreq_data *wrqu,
 			 char *extra)
 {
-	int err = 0;
-	
 	switch (info->cmd) {
 		case SIOCGIWNAME:
 			strcpy(wrqu->name, "IEEE 802.11-DS");
@@ -99,45 +101,96 @@ static int wlcompat_ioctl(struct net_device *dev,
 		case SIOCGIWFREQ:
 		{
 			channel_info_t ci;
-			wl_ioctl(dev,WLC_GET_CHANNEL, &ci, sizeof(ci));
+
+			if (wl_ioctl(dev,WLC_GET_CHANNEL, &ci, sizeof(ci)) < 0)
+				return -EINVAL;
+
 			wrqu->freq.m = ci.target_channel;
 			wrqu->freq.e = 0;
 			break;
 		}
+		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 (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
+					return -EINVAL;
+			} else {
+				return -EINVAL;
+			}
+		}
 		case SIOCGIWAP:
 		{
 			wrqu->ap_addr.sa_family = ARPHRD_ETHER;
-			wl_ioctl(dev,WLC_GET_BSSID,wrqu->ap_addr.sa_data,6);
+			if (wl_ioctl(dev,WLC_GET_BSSID,wrqu->ap_addr.sa_data,6) < 0)
+				return -EINVAL;
 			break;
 		}
 		case SIOCGIWESSID:
 		{
 			wlc_ssid_t ssid;
-			wl_ioctl(dev,WLC_GET_SSID, &ssid, sizeof(wlc_ssid_t));
+			
+			if (wl_ioctl(dev,WLC_GET_SSID, &ssid, sizeof(wlc_ssid_t)) < 0)
+				return -EINVAL;
+
 			wrqu->essid.flags = wrqu->data.flags = 1;
 			wrqu->essid.length = wrqu->data.length = ssid.SSID_len + 1;
 			memcpy(extra,ssid.SSID,ssid.SSID_len + 1);
 			break;
 		}
+		case SIOCSIWESSID:
+		{
+			wlc_ssid_t ssid;
+			memset(&ssid, 0, sizeof(ssid));
+			ssid.SSID_len = strlen(extra);
+			if (ssid.SSID_len > WLC_ESSID_MAX_SIZE)
+				ssid.SSID_len = WLC_ESSID_MAX_SIZE;
+			memcpy(ssid.SSID, extra, ssid.SSID_len);
+			if (wl_ioctl(dev, WLC_SET_SSID, &ssid, sizeof(ssid)) < 0)
+				return -EINVAL;
+			break;
+		}
 		case SIOCGIWRTS:
 		{
-			wl_ioctl(dev,WLC_GET_RTS,&(wrqu->rts.value),sizeof(int));
+			if (wl_ioctl(dev,WLC_GET_RTS,&(wrqu->rts.value),sizeof(int)) < 0) 
+				return -EINVAL;
 			break;
 		}
 		case SIOCGIWFRAG:
 		{
-			wl_ioctl(dev,WLC_GET_FRAG,&(wrqu->frag.value),sizeof(int));
+			if (wl_ioctl(dev,WLC_GET_FRAG,&(wrqu->frag.value),sizeof(int)) < 0)
+				return -EINVAL;
 			break;
 		}
 		case SIOCGIWTXPOW:
 		{
 			wrqu->txpower.value = 0;
-			wl_ioctl(dev,WLC_GET_TXPWR, &(wrqu->txpower.value), sizeof(int));
+			if (wl_ioctl(dev,WLC_GET_TXPWR, &(wrqu->txpower.value), sizeof(int)) < 0)
+				return -EINVAL;
 			wrqu->txpower.fixed = 0;
 			wrqu->txpower.disabled = 0;
 			wrqu->txpower.flags = IW_TXPOW_MWATT;
 			break;
 		}
+		case SIOCSIWTXPOW:
+		{
+			if (wrqu->txpower.flags != IW_TXPOW_MWATT)
+				return -EINVAL;
+
+			if (wl_ioctl(dev, WLC_SET_TXPWR, &wrqu->txpower.value, sizeof(int)) < 0)
+				return -EINVAL;
+		}
 		case SIOCGIWENCODE:
 		{
 			wrqu->data.flags = IW_ENCODE_DISABLED;
@@ -145,12 +198,91 @@ static int wlcompat_ioctl(struct net_device *dev,
 		}
 		case SIOCGIWRANGE:
 		{
-			err = wlcompat_ioctl_getiwrange(dev, extra);
+			return wlcompat_ioctl_getiwrange(dev, extra);
+			break;
+		}
+		case SIOCSIWMODE:
+		{
+			int ap = -1, infra = -1, passive = 0, wet = 0;
+			
+			switch (wrqu->mode) {
+				case IW_MODE_MONITOR:
+					passive = 1;
+					break;
+				case IW_MODE_ADHOC:
+					infra = 0;
+					ap = 0;
+					break;
+				case IW_MODE_MASTER:
+					infra = 1;
+					ap = 1;
+					break;
+				case IW_MODE_INFRA:
+					infra = 1;
+					ap = 0;
+					break;
+				case IW_MODE_REPEAT:
+					infra = 1;
+					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;
+			if (infra >= 0)
+				if (wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra)) < 0)
+					return -EINVAL;
+
 			break;
+						
+		}
+		case SIOCGIWMODE:
+		{
+			int ap, infra, wet, passive;
+
+			if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
+				return -EINVAL;
+			if (wl_ioctl(dev, WLC_GET_INFRA, &infra, sizeof(infra)) < 0)
+				return -EINVAL;
+			if (wl_ioctl(dev, WLC_GET_PASSIVE, &passive, sizeof(passive)) < 0)
+				return -EINVAL;
+			if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0)
+				return -EINVAL;
+
+			if (passive) {
+				wrqu->mode = IW_MODE_MONITOR;
+			} else if (!infra) {
+				wrqu->mode = IW_MODE_ADHOC;
+			} else {
+				if (ap) {
+					wrqu->mode = IW_MODE_MASTER;
+				} else {
+					if (wet) {
+						wrqu->mode = IW_MODE_REPEAT;
+					} else {
+						wrqu->mode = IW_MODE_INFRA;
+					}
+				}
+			}
+			break;
+		}
+		default:
+		{
+			return -EINVAL;
 		}
 	}
 	
-	return err;
+	return 0;
 }
 
 static const iw_handler	 wlcompat_handler[] = {
@@ -158,10 +290,10 @@ static const iw_handler	 wlcompat_handler[] = {
 	wlcompat_ioctl,		/* SIOCGIWNAME */
 	NULL,			/* SIOCSIWNWID */
 	NULL,			/* SIOCGIWNWID */
-	NULL,			/* SIOCSIWFREQ */
+	wlcompat_ioctl,		/* SIOCSIWFREQ */
 	wlcompat_ioctl,		/* SIOCGIWFREQ */
-	NULL,			/* SIOCSIWMODE */
-	NULL,			/* SIOCGIWMODE */
+	wlcompat_ioctl,		/* SIOCSIWMODE */
+	wlcompat_ioctl,		/* SIOCGIWMODE */
 	NULL,			/* SIOCSIWSENS */
 	NULL,			/* SIOCGIWSENS */
 	NULL,			/* SIOCSIWRANGE */
@@ -180,7 +312,7 @@ static const iw_handler	 wlcompat_handler[] = {
 	NULL,			/* SIOCGIWAPLIST */
 	NULL,			/* -- hole -- */
 	NULL,			/* -- hole -- */
-	NULL,			/* SIOCSIWESSID */
+	wlcompat_ioctl,		/* SIOCSIWESSID */
 	wlcompat_ioctl,		/* SIOCGIWESSID */
 	NULL,			/* SIOCSIWNICKN */
 	NULL,			/* SIOCGIWNICKN */
@@ -192,7 +324,7 @@ static const iw_handler	 wlcompat_handler[] = {
 	wlcompat_ioctl,		/* SIOCGIWRTS */
 	NULL,			/* SIOCSIWFRAG */
 	wlcompat_ioctl,		/* SIOCGIWFRAG */
-	NULL,			/* SIOCSIWTXPOW */
+	wlcompat_ioctl,		/* SIOCSIWTXPOW */
 	wlcompat_ioctl,		/* SIOCGIWTXPOW */
 	NULL,			/* SIOCSIWRETRY */
 	NULL,			/* SIOCGIWRETRY */