add repeater mode for IWMODE

[openwrt.git] / package / openwrt / wlcompat.c

diff --git a/package/openwrt/wlcompat.c b/package/openwrt/wlcompat.c
index 5245ab5..53cedd8 100644 (file)
--- a/package/openwrt/wlcompat.c
+++ b/package/openwrt/wlcompat.c
@@ -71,9 +71,13 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
        range->pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_UNICAST_R;
 
        range->min_rts = 0;
-       range->max_rts = 2347;
+       if (wl_ioctl(dev, WLC_GET_RTS, &range->max_rts, sizeof(int)) < 0)
+               range->max_rts = 2347;
+
        range->min_frag = 256;
-       range->max_frag = 2346;
+       
+       if (wl_ioctl(dev, WLC_GET_FRAG, &range->max_frag, sizeof(int)) < 0)
+               range->max_frag = 2346;
 
        range->min_pmp = 0;
        range->max_pmp = 65535000;
@@ -197,6 +201,81 @@ static int wlcompat_ioctl(struct net_device *dev,
                        return wlcompat_ioctl_getiwrange(dev, extra);
                        break;
                }
+               case SIOCSIWMODE:
+               {
+                       int ap = -1, infra = -1, passive = 0, wet = 0;
+                       
+                       switch (wrqu->mode) {
+                               case IW_MODE_MONITOR:
+                                       passive = 1;
+                                       break;
+                               case IW_MODE_ADHOC:
+                                       infra = 0;
+                                       ap = 0;
+                                       break;
+                               case IW_MODE_MASTER:
+                                       infra = 1;
+                                       ap = 1;
+                                       break;
+                               case IW_MODE_INFRA:
+                                       infra = 1;
+                                       ap = 0;
+                                       break;
+                               case IW_MODE_REPEAT:
+                                       infra = 1;
+                                       ap = 0;
+                                       wet = 1;
+                                       break;
+                               default:
+                                       return -EINVAL;
+                       }
+                       
+                       if (wl_ioctl(dev, WLC_SET_PASSIVE, &passive, sizeof(passive)) < 0)
+                               return -EINVAL;
+                       if (wl_ioctl(dev, WLC_SET_MONITOR, &passive, sizeof(passive)) < 0)
+                               return -EINVAL;
+                       if (wl_ioctl(dev, WLC_SET_WET, &wet, sizeof(wet)) < 0)
+                               return -EINVAL;
+                       if (ap >= 0)
+                               if (wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap)) < 0)
+                                       return -EINVAL;
+                       if (infra >= 0)
+                               if (wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra)) < 0)
+                                       return -EINVAL;
+
+                       break;
+                                               
+               }
+               case SIOCGIWMODE:
+               {
+                       int ap, infra, wet, passive;
+
+                       if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
+                               return -EINVAL;
+                       if (wl_ioctl(dev, WLC_GET_INFRA, &infra, sizeof(infra)) < 0)
+                               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;
+                       } else if (!infra) {
+                               wrqu->mode = IW_MODE_ADHOC;
+                       } else {
+                               if (ap) {
+                                       wrqu->mode = IW_MODE_MASTER;
+                               } else {
+                                       if (wet) {
+                                               wrqu->mode = IW_MODE_REPEAT;
+                                       } else {
+                                               wrqu->mode = IW_MODE_INFRA;
+                                       }
+                               }
+                       }
+                       break;
+               }
                default:
                {
                        return -EINVAL;
@@ -213,8 +292,8 @@ static const iw_handler      wlcompat_handler[] = {
        NULL,                   /* SIOCGIWNWID */
        wlcompat_ioctl,         /* SIOCSIWFREQ */
        wlcompat_ioctl,         /* SIOCGIWFREQ */
-       NULL,                   /* SIOCSIWMODE */
-       NULL,                   /* SIOCGIWMODE */
+       wlcompat_ioctl,         /* SIOCSIWMODE */
+       wlcompat_ioctl,         /* SIOCGIWMODE */
        NULL,                   /* SIOCSIWSENS */
        NULL,                   /* SIOCGIWSENS */
        NULL,                   /* SIOCSIWRANGE */