qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-17 15:54:43 +02:00
Code

wlcompat: show wet mode as Managed mode as well to avoid confusion

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9529 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-11-10 19:01:00 +00:00
parent ed261aac7d
commit 8c23d0644a
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/broadcom-wl/src/wlcompat/wlcompat.c
View File

@ -778,7 +778,8 @@ static int wlcompat_ioctl(struct net_device *dev,
case SIOCSIWMODE: case SIOCSIWMODE:
{ {
int ap = -1, infra = -1, passive = 0, wet = 0; int ap = -1, infra = -1, passive = 0, wet = 0;
wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet));
switch (wrqu->mode) { switch (wrqu->mode) {
case IW_MODE_MONITOR: case IW_MODE_MONITOR:
passive = 1; passive = 1;
@ -794,27 +795,27 @@ static int wlcompat_ioctl(struct net_device *dev,
case IW_MODE_INFRA: case IW_MODE_INFRA:
infra = 1; infra = 1;
ap = 0; ap = 0;
wet = 0;
break; break;
case IW_MODE_REPEAT: case IW_MODE_REPEAT:
infra = 1; infra = 1;
ap = 0; ap = 0;
wet = 1; wet = 1;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
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)); if ((ap == 0) && (infra == 1))
if (ap >= 0) wl_ioctl(dev, WLC_SET_WET, &wet, sizeof(wet));
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)
wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra)); wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra));
break; break;
} }
case SIOCGIWMODE: case SIOCGIWMODE:
{ {
@ -826,8 +827,6 @@ static int wlcompat_ioctl(struct net_device *dev,
return -EINVAL; return -EINVAL;
if (wl_ioctl(dev, WLC_GET_PASSIVE, &passive, sizeof(passive)) < 0) if (wl_ioctl(dev, WLC_GET_PASSIVE, &passive, sizeof(passive)) < 0)
return -EINVAL; return -EINVAL;
if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0)
return -EINVAL;
if (passive) { if (passive) {
wrqu->mode = IW_MODE_MONITOR; wrqu->mode = IW_MODE_MONITOR;
@ -837,11 +836,7 @@ static int wlcompat_ioctl(struct net_device *dev,
if (ap) { if (ap) {
wrqu->mode = IW_MODE_MASTER; wrqu->mode = IW_MODE_MASTER;
} else { } else {
if (wet) { wrqu->mode = IW_MODE_INFRA;
wrqu->mode = IW_MODE_REPEAT;
} else {
wrqu->mode = IW_MODE_INFRA;
}
} }
} }
break; break;