{
char buf[128];
int buf_len;
+ int ret;
/* check for overflow */
if ((buf_len = strlen(var)) + 1 + len > sizeof(buf))
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 get_primary_key(struct net_device *dev)
+{
+ 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)
{
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;
}
}
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;
}
{
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:
/* 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)
+ 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 val = 0, wep = 1, wrestrict = 1;
+ int index = (wrqu->data.flags & IW_ENCODE_INDEX) - 1;
- if (wl_set_val(dev, "qtxpower", &wrqu->txpower.value, sizeof(int)) < 0)
+ if (index < 0)
+ index = get_primary_key(dev);
+
+ 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;
+
+ 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_ioctl(dev, WLC_SET_KEY, &key, sizeof(key)) < 0)
+ return -EINVAL;
}
+
+ if (index >= 0)
+ wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index));
+
+ if (wrestrict >= 0)
+ wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict));
+
+ break;
}
case SIOCGIWENCODE:
{
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) {
}
case SIOCSIWMODE:
{
- int ap = -1, infra = -1, passive = 0, wet = 0, wds = 0;
+ int ap = -1, infra = -1, passive = 0, wet = 0;
switch (wrqu->mode) {
case IW_MODE_MONITOR:
ap = 0;
wet = 1;
break;
- case IW_MODE_SECOND:
- ap = 0;
- infra = 1;
- wds = 1;
default:
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));
- wl_ioctl(dev, WLC_SET_WET, &wds, sizeof(wds));
if (ap >= 0)
wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap));
if (infra >= 0)
}
case SIOCGIWMODE:
{
- int ap, infra, wet, wds, passive;
+ int ap, infra, wet, passive;
if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
return -EINVAL;
return -EINVAL;
if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0)
return -EINVAL;
- if (wl_ioctl(dev, WLC_GET_WET, &wds, sizeof(wds)) < 0)
- return -EINVAL;
if (passive) {
wrqu->mode = IW_MODE_MONITOR;
} else if (!infra) {
wrqu->mode = IW_MODE_ADHOC;
- } else if (wds) {
- wrqu->mode = IW_MODE_SECOND;
} else {
if (ap) {
wrqu->mode = IW_MODE_MASTER;
wlcompat_ioctl, /* SIOCGIWTXPOW */
NULL, /* SIOCSIWRETRY */
NULL, /* SIOCGIWRETRY */
- NULL, /* SIOCSIWENCODE */
+ wlcompat_ioctl, /* SIOCSIWENCODE */
wlcompat_ioctl, /* SIOCGIWENCODE */
};
dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
#ifdef DEBUG
printk("broadcom driver private data: 0x%08x\n", dev->priv);
- print_buffer(200, dev->priv);
#endif
return 0;
}
projects / openwrt.git / blobdiff