mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-26 06:34:05 +02:00
implement SIOCGIWENCODE in wlcompat (broadcom disabled the ioctl to get the wsec_info, so we have to read it from the chipset's shmem. got the offsets from linux-bcom4301)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@886 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
af2a9e621e
commit
b8435a4473
@ -43,6 +43,8 @@ const long channel_frequency[] = {
|
|||||||
};
|
};
|
||||||
#define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )
|
#define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static int wlcompat_private_ioctl(struct net_device *dev,
|
static int wlcompat_private_ioctl(struct net_device *dev,
|
||||||
struct iw_request_info *info,
|
struct iw_request_info *info,
|
||||||
union iwreq_data *wrqu,
|
union iwreq_data *wrqu,
|
||||||
@ -101,6 +103,13 @@ static int wl_get_val(struct net_device *dev, char *var, void *val, int len)
|
|||||||
return 0;
|
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,
|
static int wlcompat_ioctl_getiwrange(struct net_device *dev,
|
||||||
char *extra)
|
char *extra)
|
||||||
@ -397,17 +406,43 @@ static int wlcompat_ioctl(struct net_device *dev,
|
|||||||
}
|
}
|
||||||
case SIOCGIWENCODE:
|
case SIOCGIWENCODE:
|
||||||
{
|
{
|
||||||
int val = 0;
|
int val;
|
||||||
|
|
||||||
if (wl_ioctl(dev, WLC_GET_WEP, &val, sizeof(val)) < 0)
|
if (wl_ioctl(dev, WLC_GET_WEP, &val, sizeof(val)) < 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
|
||||||
if (val > 0) {
|
if (val > 0) {
|
||||||
wrqu->data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
|
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 {
|
} else {
|
||||||
wrqu->data.flags = IW_ENCODE_DISABLED;
|
wrqu->data.flags = IW_ENCODE_DISABLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user