mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 15:04:16 +02:00
implement SIOCSIWENCODE in wlcompat
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1191 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
df552e6f7c
commit
a00b3add9f
@ -115,6 +115,19 @@ static int wl_get_val(struct net_device *dev, char *var, void *val, int len)
|
|||||||
return 0;
|
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,
|
static int wlcompat_ioctl_getiwrange(struct net_device *dev,
|
||||||
char *extra)
|
char *extra)
|
||||||
{
|
{
|
||||||
@ -427,6 +440,44 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
case SIOCSIWENCODE:
|
||||||
|
{
|
||||||
|
int 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)
|
||||||
|
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_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_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;
|
||||||
|
}
|
||||||
case SIOCGIWENCODE:
|
case SIOCGIWENCODE:
|
||||||
{
|
{
|
||||||
int val;
|
int val;
|
||||||
@ -436,13 +487,7 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
|
|
||||||
|
|
||||||
if (val > 0) {
|
if (val > 0) {
|
||||||
int key;
|
int key = get_primary_key(dev);
|
||||||
|
|
||||||
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;
|
wrqu->data.flags = IW_ENCODE_ENABLED;
|
||||||
if (key-- > 0) {
|
if (key-- > 0) {
|
||||||
@ -473,7 +518,7 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
}
|
}
|
||||||
case SIOCSIWMODE:
|
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) {
|
switch (wrqu->mode) {
|
||||||
case IW_MODE_MONITOR:
|
case IW_MODE_MONITOR:
|
||||||
@ -496,10 +541,6 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
ap = 0;
|
ap = 0;
|
||||||
wet = 1;
|
wet = 1;
|
||||||
break;
|
break;
|
||||||
case IW_MODE_SECOND:
|
|
||||||
ap = 0;
|
|
||||||
infra = 1;
|
|
||||||
wds = 1;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -508,7 +549,6 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
wl_ioctl(dev, WLC_SET_PASSIVE, &passive, sizeof(passive));
|
wl_ioctl(dev, WLC_SET_PASSIVE, &passive, sizeof(passive));
|
||||||
wl_ioctl(dev, WLC_SET_MONITOR, &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, &wet, sizeof(wet));
|
||||||
wl_ioctl(dev, WLC_SET_WET, &wds, sizeof(wds));
|
|
||||||
if (ap >= 0)
|
if (ap >= 0)
|
||||||
wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap));
|
wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap));
|
||||||
if (infra >= 0)
|
if (infra >= 0)
|
||||||
@ -519,7 +559,7 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
}
|
}
|
||||||
case SIOCGIWMODE:
|
case SIOCGIWMODE:
|
||||||
{
|
{
|
||||||
int ap, infra, wet, wds, passive;
|
int ap, infra, wet, passive;
|
||||||
|
|
||||||
if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
|
if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -529,15 +569,11 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0)
|
if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (wl_ioctl(dev, WLC_GET_WET, &wds, sizeof(wds)) < 0)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (passive) {
|
if (passive) {
|
||||||
wrqu->mode = IW_MODE_MONITOR;
|
wrqu->mode = IW_MODE_MONITOR;
|
||||||
} else if (!infra) {
|
} else if (!infra) {
|
||||||
wrqu->mode = IW_MODE_ADHOC;
|
wrqu->mode = IW_MODE_ADHOC;
|
||||||
} else if (wds) {
|
|
||||||
wrqu->mode = IW_MODE_SECOND;
|
|
||||||
} else {
|
} else {
|
||||||
if (ap) {
|
if (ap) {
|
||||||
wrqu->mode = IW_MODE_MASTER;
|
wrqu->mode = IW_MODE_MASTER;
|
||||||
@ -606,7 +642,7 @@ static const iw_handler wlcompat_handler[] = {
|
|||||||
wlcompat_ioctl, /* SIOCGIWTXPOW */
|
wlcompat_ioctl, /* SIOCGIWTXPOW */
|
||||||
NULL, /* SIOCSIWRETRY */
|
NULL, /* SIOCSIWRETRY */
|
||||||
NULL, /* SIOCGIWRETRY */
|
NULL, /* SIOCGIWRETRY */
|
||||||
NULL, /* SIOCSIWENCODE */
|
wlcompat_ioctl, /* SIOCSIWENCODE */
|
||||||
wlcompat_ioctl, /* SIOCGIWENCODE */
|
wlcompat_ioctl, /* SIOCGIWENCODE */
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -828,7 +864,6 @@ static int __init wlcompat_init()
|
|||||||
dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
|
dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk("broadcom driver private data: 0x%08x\n", dev->priv);
|
printk("broadcom driver private data: 0x%08x\n", dev->priv);
|
||||||
print_buffer(200, dev->priv);
|
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user