diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-11-10 19:01:00 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-11-10 19:01:00 +0000 |
| commit | 8c23d0644ab3698c5c47d47f54f3ccece265c84c (patch) | |
| tree | 02588b79667a87d88213b095e823ee236453d752 /package | |
| parent | ed261aac7dd5c71351f720ab16a12b5bd8c1073b (diff) | |
wlcompat: show wet mode as Managed mode as well to avoid confusion
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9529 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/broadcom-wl/src/wlcompat/wlcompat.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/package/broadcom-wl/src/wlcompat/wlcompat.c b/package/broadcom-wl/src/wlcompat/wlcompat.c index 3e869ea795..2694a851c0 100644 --- a/package/broadcom-wl/src/wlcompat/wlcompat.c +++ b/package/broadcom-wl/src/wlcompat/wlcompat.c @@ -778,7 +778,8 @@ static int wlcompat_ioctl(struct net_device *dev, case SIOCSIWMODE: { int ap = -1, infra = -1, passive = 0, wet = 0; - + + wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)); switch (wrqu->mode) { case IW_MODE_MONITOR: passive = 1; @@ -794,27 +795,27 @@ static int wlcompat_ioctl(struct net_device *dev, case IW_MODE_INFRA: infra = 1; ap = 0; + wet = 0; break; case IW_MODE_REPEAT: infra = 1; ap = 0; wet = 1; break; - 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)); - if (ap >= 0) + if ((ap == 0) && (infra == 1)) + wl_ioctl(dev, WLC_SET_WET, &wet, sizeof(wet)); + if (ap >= 0) wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap)); if (infra >= 0) wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra)); break; - } case SIOCGIWMODE: { @@ -826,8 +827,6 @@ static int wlcompat_ioctl(struct net_device *dev, return -EINVAL; if (wl_ioctl(dev, WLC_GET_PASSIVE, &passive, sizeof(passive)) < 0) return -EINVAL; - if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0) - return -EINVAL; if (passive) { wrqu->mode = IW_MODE_MONITOR; @@ -837,11 +836,7 @@ static int wlcompat_ioctl(struct net_device *dev, if (ap) { wrqu->mode = IW_MODE_MASTER; } else { - if (wet) { - wrqu->mode = IW_MODE_REPEAT; - } else { - wrqu->mode = IW_MODE_INFRA; - } + wrqu->mode = IW_MODE_INFRA; } } break; |