X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a00b3add9f9810e6924e5f51f49423c82708c2cd..839e5b8db5dd7e2887e3f9ef5de7dec6366ec9bc:/target/linux/package/wlcompat/wlcompat.c diff --git a/target/linux/package/wlcompat/wlcompat.c b/target/linux/package/wlcompat/wlcompat.c index d499d7955..7063c809a 100644 --- a/target/linux/package/wlcompat/wlcompat.c +++ b/target/linux/package/wlcompat/wlcompat.c @@ -2,7 +2,7 @@ * wlcompat.c * * Copyright (C) 2005 Mike Baker, - * Felix Fietkau + * Felix Fietkau * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -31,9 +31,10 @@ #include #include -#include static struct net_device *dev; +static unsigned short bss_force; +static struct iw_statistics wstats; char buf[WLC_IOCTL_MAXLEN]; /* The frequency of each channel in MHz */ @@ -83,6 +84,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 +94,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); @@ -135,6 +139,7 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev, struct iw_range *range; range = (struct iw_range *) extra; + bzero(extra, sizeof(struct iw_range)); range->we_version_compiled = WIRELESS_EXT; range->we_version_source = WIRELESS_EXT; @@ -164,6 +169,10 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev, range->min_pmt = 0; range->max_pmt = 65535 * 1000; + range->max_qual.qual = 0; + range->max_qual.level = 0; + range->max_qual.noise = 0; + range->min_rts = 0; if (wl_ioctl(dev, WLC_GET_RTS, &range->max_rts, sizeof(int)) < 0) range->max_rts = 2347; @@ -173,7 +182,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; } @@ -213,6 +222,46 @@ static int wlcompat_set_scan(struct net_device *dev, } +struct iw_statistics *wlcompat_get_wireless_stats(struct net_device *dev) +{ + wl_bss_info_t *bss_info = (wl_bss_info_t *) buf; + get_pktcnt_t pkt; + unsigned int rssi, noise, ap; + + memset(&wstats, 0, sizeof(wstats)); + memset(&pkt, 0, sizeof(pkt)); + memset(buf, 0, sizeof(buf)); + bss_info->version = 0x2000; + wl_ioctl(dev, WLC_GET_BSS_INFO, bss_info, WLC_IOCTL_MAXLEN); + wl_ioctl(dev, WLC_GET_PKTCNTS, &pkt, sizeof(pkt)); + + rssi = 0; + if ((wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0) || ap) { + if (wl_ioctl(dev, WLC_GET_PHY_NOISE, &noise, sizeof(noise)) < 0) + noise = 0; + } else { + // somehow the structure doesn't fit here + rssi = buf[82]; + noise = buf[84]; + } + rssi = (rssi == 0 ? 1 : rssi); + wstats.qual.updated = 0x10; + if (rssi <= 1) + wstats.qual.updated |= 0x20; + if (noise <= 1) + wstats.qual.updated |= 0x40; + + if ((wstats.qual.updated & 0x60) == 0x60) + return NULL; + + wstats.qual.level = rssi; + wstats.qual.noise = noise; + wstats.discard.misc = pkt.rx_bad_pkt; + wstats.discard.retries = pkt.tx_bad_pkt; + + return &wstats; +} + static int wlcompat_get_scan(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, @@ -226,7 +275,10 @@ static int wlcompat_get_scan(struct net_device *dev, char *end_buf = extra + IW_SCAN_MAX_DATA; struct iw_event iwe; int i, j; - + int rssi, noise; + + results->buflen = WLC_IOCTL_MAXLEN - sizeof(wl_scan_results_t); + if (wl_ioctl(dev, WLC_SCAN_RESULTS, buf, WLC_IOCTL_MAXLEN) < 0) return -EAGAIN; @@ -256,9 +308,9 @@ static int wlcompat_get_scan(struct net_device *dev, /* add quality statistics */ iwe.cmd = IWEVQUAL; + iwe.u.qual.qual = 0; iwe.u.qual.level = bss_info->RSSI; iwe.u.qual.noise = bss_info->phy_noise; - iwe.u.qual.qual = 0; current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); /* send rate information */ @@ -309,43 +361,84 @@ 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; } case SIOCSIWAP: { int ap = 0; - + int infra = 0; + rw_reg_t reg; + + memset(®, 0, sizeof(reg)); + 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) + + if (wl_ioctl(dev, WLC_GET_INFRA, &infra, sizeof(infra)) < 0) + return -EINVAL; + + if (!infra) { + wl_ioctl(dev, WLC_SET_BSSID, wrqu->ap_addr.sa_data, 6); + + reg.size = 4; + reg.byteoff = 0x184; + reg.val = bss_force << 16 | bss_force; + wl_ioctl(dev, WLC_W_REG, ®, sizeof(reg)); + + reg.byteoff = 0x180; + wl_ioctl(dev, WLC_R_REG, ®, sizeof(reg)); + reg.val = bss_force << 16; + wl_ioctl(dev, WLC_W_REG, ®, sizeof(reg)); + } + + if (wl_ioctl(dev, ((ap || !infra) ? WLC_SET_BSSID : WLC_REASSOC), wrqu->ap_addr.sa_data, 6) < 0) return -EINVAL; break; } case SIOCGIWAP: { +#ifdef DEBUG + rw_reg_t reg; + memset(®, 0, sizeof(reg)); + + reg.size = 4; + reg.byteoff = 0x184; + wl_ioctl(dev, WLC_R_REG, ®, sizeof(reg)); + printk("bss time = 0x%08x", reg.val); + + reg.byteoff = 0x180; + wl_ioctl(dev, WLC_R_REG, ®, sizeof(reg)); + printk("%08x\n", reg.val); +#endif + wrqu->ap_addr.sa_family = ARPHRD_ETHER; if (wl_ioctl(dev,WLC_GET_BSSID,wrqu->ap_addr.sa_data,6) < 0) return -EINVAL; @@ -401,19 +494,22 @@ static int wlcompat_ioctl(struct net_device *dev, } case SIOCGIWTXPOW: { - int radio; + int radio, override; - 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; + override = (wrqu->txpower.value & WL_TXPWR_OVERRIDE) == WL_TXPWR_OVERRIDE; wrqu->txpower.value &= ~WL_TXPWR_OVERRIDE; + if (!override && (wrqu->txpower.value > 76)) + wrqu->txpower.value = 76; + 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 +517,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 +573,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: { @@ -646,6 +748,19 @@ static const iw_handler wlcompat_handler[] = { wlcompat_ioctl, /* SIOCGIWENCODE */ }; + +#define WLCOMPAT_SET_MONITOR SIOCIWFIRSTPRIV + 0 +#define WLCOMPAT_GET_MONITOR SIOCIWFIRSTPRIV + 1 +#define WLCOMPAT_SET_TXPWR_LIMIT SIOCIWFIRSTPRIV + 2 +#define WLCOMPAT_GET_TXPWR_LIMIT SIOCIWFIRSTPRIV + 3 +#define WLCOMPAT_SET_ANTDIV SIOCIWFIRSTPRIV + 4 +#define WLCOMPAT_GET_ANTDIV SIOCIWFIRSTPRIV + 5 +#define WLCOMPAT_SET_TXANT SIOCIWFIRSTPRIV + 6 +#define WLCOMPAT_GET_TXANT SIOCIWFIRSTPRIV + 7 +#define WLCOMPAT_SET_BSS_FORCE SIOCIWFIRSTPRIV + 8 +#define WLCOMPAT_GET_BSS_FORCE SIOCIWFIRSTPRIV + 9 + + static int wlcompat_private_ioctl(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, @@ -723,6 +838,16 @@ static int wlcompat_private_ioctl(struct net_device *dev, break; } + case WLCOMPAT_SET_BSS_FORCE: + { + bss_force = (unsigned short) *value; + break; + } + case WLCOMPAT_GET_BSS_FORCE: + { + *extra = (int) bss_force; + break; + } default: { return -EINVAL; @@ -774,6 +899,16 @@ static const struct iw_priv_args wlcompat_private_args[] = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_txant" }, + { WLCOMPAT_SET_BSS_FORCE, + IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, + 0, + "set_bss_force" + }, + { WLCOMPAT_GET_BSS_FORCE, + 0, + IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, + "get_bss_force" + }, }; static const iw_handler wlcompat_private[] = @@ -846,6 +981,7 @@ static int __init wlcompat_init() { int found = 0, i; char *devname = "eth0"; + bss_force = 0; 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)) @@ -862,6 +998,7 @@ 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; + dev->get_wireless_stats = wlcompat_get_wireless_stats; #ifdef DEBUG printk("broadcom driver private data: 0x%08x\n", dev->priv); #endif @@ -870,6 +1007,7 @@ static int __init wlcompat_init() static void __exit wlcompat_exit() { + dev->get_wireless_stats = NULL; dev->wireless_handlers = NULL; dev->do_ioctl = old_ioctl; return;