add minor dsl driver cleanup

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

diff --git a/openwrt/target/linux/package/wlcompat/wlcompat.c b/openwrt/target/linux/package/wlcompat/wlcompat.c
index 1f822a4..b5f9bff 100644 (file)
--- a/openwrt/target/linux/package/wlcompat/wlcompat.c
+++ b/openwrt/target/linux/package/wlcompat/wlcompat.c
@@ -2,7 +2,7 @@
  * wlcompat.c
  *
  * Copyright (C) 2005 Mike Baker,
  * wlcompat.c
  *
  * Copyright (C) 2005 Mike Baker,

- *                    Felix Fietkau <nbd@vd-s.ath.cx>
+ *                    Felix Fietkau <openwrt@nbd.name>

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License


@@ -31,9 +31,9 @@
 
 #include <net/iw_handler.h>
 #include <wlioctl.h>
 
 #include <net/iw_handler.h>
 #include <wlioctl.h>

-#include <wlcompat.h>

 
 static struct net_device *dev;
 
 static struct net_device *dev;

+static unsigned short bss_force;

 char buf[WLC_IOCTL_MAXLEN];
 
 /* The frequency of each channel in MHz */
 char buf[WLC_IOCTL_MAXLEN];
 
 /* The frequency of each channel in MHz */


@@ -83,6 +83,7 @@ static int wl_set_val(struct net_device *dev, char *var, void *val, int len)
 {
        char buf[128];
        int buf_len;
 {
        char buf[128];
        int buf_len;

+       int ret;

 
        /* check for overflow */
        if ((buf_len = strlen(var)) + 1 + len > sizeof(buf))
 
        /* check for overflow */
        if ((buf_len = strlen(var)) + 1 + len > sizeof(buf))


@@ -92,29 +93,44 @@ static int wl_set_val(struct net_device *dev, char *var, void *val, int len)
        buf_len += 1;
 
        /* append int value onto the end of the name string */
        buf_len += 1;
 
        /* append int value onto the end of the name string */

-       memcpy(&buf[buf_len], val, len);
+       memcpy(&(buf[buf_len]), val, len);

        buf_len += len;
 
        buf_len += len;
 

-       return wl_ioctl(dev, WLC_SET_VAR, buf, buf_len);
+       ret = wl_ioctl(dev, WLC_SET_VAR, buf, buf_len);
+       return ret;

 }
 
 static int wl_get_val(struct net_device *dev, char *var, void *val, int len)
 {
        char buf[128];
 }
 
 static int wl_get_val(struct net_device *dev, char *var, void *val, int len)
 {
        char buf[128];

+       int buf_len;

        int ret;
 
        /* check for overflow */
        int ret;
 
        /* check for overflow */

-       if (strlen(var) + 1 > sizeof(buf) || len > sizeof(buf))
+       if ((buf_len = strlen(var)) + 1 > sizeof(buf) || len > sizeof(buf))

                return -1;
        
        strcpy(buf, var);
                return -1;
        
        strcpy(buf, var);

-       if ((ret = wl_ioctl(dev, WLC_GET_VAR, buf, sizeof(buf))))
+       if (ret = wl_ioctl(dev, WLC_GET_VAR, buf, buf_len + len))

                return ret;
 
        memcpy(val, buf, len);
        return 0;
 }
 
                return ret;
 
        memcpy(val, buf, len);
        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,
                                    char *extra)
 {
 static int wlcompat_ioctl_getiwrange(struct net_device *dev,
                                    char *extra)
 {


@@ -160,7 +176,7 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
        if (wl_ioctl(dev, WLC_GET_FRAG, &range->max_frag, sizeof(int)) < 0)
                range->max_frag = 2346;
 
        if (wl_ioctl(dev, WLC_GET_FRAG, &range->max_frag, sizeof(int)) < 0)
                range->max_frag = 2346;
 

-       range->txpower_capa = IW_TXPOW_MWATT;
+       range->txpower_capa = IW_TXPOW_DBM;

 
        return 0;
 }
 
        return 0;
 }


@@ -296,43 +312,84 @@ static int wlcompat_ioctl(struct net_device *dev,
                }
                case SIOCSIWFREQ:
                {
                }
                case SIOCSIWFREQ:
                {

-                       if (wrqu->freq.e == 1) {
-                               int channel = 0;
-                               int f = wrqu->freq.m / 100000;
-                               while ((channel < NUM_CHANNELS + 1) && (f != channel_frequency[channel]))
-                                       channel++;
-                               
-                               if (channel == NUM_CHANNELS) // channel not found
-                                       return -EINVAL;
-
-                               wrqu->freq.e = 0;
-                               wrqu->freq.m = channel + 1;
-                       }
-                       if ((wrqu->freq.e == 0) && (wrqu->freq.m < 1000)) {
+                       if (wrqu->freq.m == -1) {
+                               wrqu->freq.m = 0;

                                if (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
                                        return -EINVAL;
                        } else {
                                if (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
                                        return -EINVAL;
                        } else {

-                               return -EINVAL;
+                               if (wrqu->freq.e == 1) {
+                                       int channel = 0;
+                                       int f = wrqu->freq.m / 100000;
+                                       while ((channel < NUM_CHANNELS + 1) && (f != channel_frequency[channel]))
+                                               channel++;
+                                       
+                                       if (channel == NUM_CHANNELS) // channel not found
+                                               return -EINVAL;
+
+                                       wrqu->freq.e = 0;
+                                       wrqu->freq.m = channel + 1;
+                               }
+                               if ((wrqu->freq.e == 0) && (wrqu->freq.m < 1000)) {
+                                       if (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
+                                               return -EINVAL;
+                               } else {
+                                       return -EINVAL;
+                               }

                        }
                        break;
                }
                case SIOCSIWAP:
                {
                        int ap = 0;
                        }
                        break;
                }
                case SIOCSIWAP:
                {
                        int ap = 0;

-                       
+                       int infra = 0;
+                       rw_reg_t reg;
+
+                       memset(&reg, 0, sizeof(reg));
+

                        if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
                                return -EINVAL;
 
                        if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
                                return -EINVAL;
                        if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
                                return -EINVAL;
 
                        if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
                                return -EINVAL;

-                       
-                       if (wl_ioctl(dev, (ap ? WLC_SET_BSSID : WLC_REASSOC), wrqu->ap_addr.sa_data, 6) < 0)
+
+                       if (wl_ioctl(dev, WLC_GET_INFRA, &infra, sizeof(infra)) < 0)
+                               return -EINVAL;
+
+                       if (!infra) {
+                               wl_ioctl(dev, WLC_SET_BSSID, wrqu->ap_addr.sa_data, 6);
+
+                               reg.size = 4;
+                               reg.byteoff = 0x184;
+                               reg.val = bss_force << 16 | bss_force;
+                               wl_ioctl(dev, WLC_W_REG, &reg, sizeof(reg));
+                               
+                               reg.byteoff = 0x180;
+                               wl_ioctl(dev, WLC_R_REG, &reg, sizeof(reg));
+                               reg.val = bss_force << 16;
+                               wl_ioctl(dev, WLC_W_REG, &reg, sizeof(reg));
+                       }
+
+                       if (wl_ioctl(dev, ((ap || !infra) ? WLC_SET_BSSID : WLC_REASSOC), wrqu->ap_addr.sa_data, 6) < 0)

                                return -EINVAL;
 
                        break;
                }
                case SIOCGIWAP:
                {
                                return -EINVAL;
 
                        break;
                }
                case SIOCGIWAP:
                {

+#ifdef DEBUG
+                       rw_reg_t reg;
+                       memset(&reg, 0, sizeof(reg));
+
+                       reg.size = 4;
+                       reg.byteoff = 0x184;
+                       wl_ioctl(dev, WLC_R_REG, &reg, sizeof(reg));
+                       printk("bss time = 0x%08x", reg.val);
+                       
+                       reg.byteoff = 0x180;
+                       wl_ioctl(dev, WLC_R_REG, &reg, sizeof(reg));
+                       printk("%08x\n", reg.val);
+#endif
+                       

                        wrqu->ap_addr.sa_family = ARPHRD_ETHER;
                        if (wl_ioctl(dev,WLC_GET_BSSID,wrqu->ap_addr.sa_data,6) < 0)
                                return -EINVAL;
                        wrqu->ap_addr.sa_family = ARPHRD_ETHER;
                        if (wl_ioctl(dev,WLC_GET_BSSID,wrqu->ap_addr.sa_data,6) < 0)
                                return -EINVAL;


@@ -390,17 +447,17 @@ static int wlcompat_ioctl(struct net_device *dev,
                {
                        int radio;
 
                {
                        int radio;
 

-                       if (wl_ioctl(dev, WLC_GET_RADIO, &radio, sizeof(int)) < 0)
-                               return -EINVAL;
+                       wl_ioctl(dev, WLC_GET_RADIO, &radio, sizeof(int));

                        
                        if (wl_get_val(dev, "qtxpower", &(wrqu->txpower.value), sizeof(int)) < 0)
                                return -EINVAL;
                        
                        wrqu->txpower.value &= ~WL_TXPWR_OVERRIDE;
                        
                        if (wl_get_val(dev, "qtxpower", &(wrqu->txpower.value), sizeof(int)) < 0)
                                return -EINVAL;
                        
                        wrqu->txpower.value &= ~WL_TXPWR_OVERRIDE;

+                       wrqu->txpower.value /= 4;

                                
                        wrqu->txpower.fixed = 0;
                        wrqu->txpower.disabled = radio;
                                
                        wrqu->txpower.fixed = 0;
                        wrqu->txpower.disabled = radio;

-                       wrqu->txpower.flags = IW_TXPOW_MWATT;
+                       wrqu->txpower.flags = IW_TXPOW_DBM;

                        break;
                }
                case SIOCSIWTXPOW:
                        break;
                }
                case SIOCSIWTXPOW:


@@ -408,24 +465,68 @@ static int wlcompat_ioctl(struct net_device *dev,
                        /* This is weird: WLC_SET_RADIO with 1 as argument disables the radio */
                        int radio = wrqu->txpower.disabled;
 
                        /* This is weird: WLC_SET_RADIO with 1 as argument disables the radio */
                        int radio = wrqu->txpower.disabled;
 

-                       if (wl_ioctl(dev, WLC_SET_RADIO, &radio, sizeof(int)) < 0)
-                               return -EINVAL;
+                       wl_ioctl(dev, WLC_SET_RADIO, &radio, sizeof(int));

                        
                        

-                       if (!wrqu->txpower.disabled) {
-                               int override;
-
-                               if (wl_get_val(dev, "qtxpower", &override, sizeof(int)) < 0)
+                       if (!wrqu->txpower.disabled && (wrqu->txpower.value > 0)) {
+                               int value;
+                               
+                               if (wl_get_val(dev, "qtxpower", &value, sizeof(int)) < 0)

                                        return -EINVAL;
                                
                                        return -EINVAL;
                                

-                               wrqu->txpower.value |= override & WL_TXPWR_OVERRIDE;
+                               value &= WL_TXPWR_OVERRIDE;
+                               wrqu->txpower.value *= 4;
+                               wrqu->txpower.value |= value;

                                
                                

-                               if (wrqu->txpower.flags != IW_TXPOW_MWATT)
+                               if (wrqu->txpower.flags != IW_TXPOW_DBM)

                                        return -EINVAL;
                                        return -EINVAL;

+                               
+                               if (wrqu->txpower.value > 0)
+                                       if (wl_set_val(dev, "qtxpower", &(wrqu->txpower.value), sizeof(int)) < 0)
+                                               return -EINVAL;
+                       }
+                       break;
+               }
+               case SIOCSIWENCODE:
+               {
+                       int val = 0, wep = 1, wrestrict = 1;
+                       int index = (wrqu->data.flags & IW_ENCODE_INDEX) - 1;

 
 

-                               if (wl_set_val(dev, "qtxpower", &wrqu->txpower.value, sizeof(int)) < 0)
+                       if (index < 0)
+                               index = get_primary_key(dev);
+                       
+                       if (wrqu->data.flags & IW_ENCODE_DISABLED) {
+                               wep = 0;
+                               if (wl_ioctl(dev, WLC_SET_WSEC, &wep, sizeof(val)) < 0)

                                        return -EINVAL;
                                        return -EINVAL;

+                               return 0;
+                       }

 
 

+                       if (wl_ioctl(dev, WLC_SET_WSEC, &wep, sizeof(val)) < 0)
+                               return -EINVAL;
+
+                       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)
+                               wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index));
+                       
+                       if (wrestrict >= 0)
+                               wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict));
+
+                       break;

                }
                case SIOCGIWENCODE:
                {
                }
                case SIOCGIWENCODE:
                {


@@ -436,13 +537,7 @@ static int wlcompat_ioctl(struct net_device *dev,
                        
 
                        if (val > 0) {
                        
 
                        if (val > 0) {

-                               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;
-                               }
+                               int key = get_primary_key(dev);

                                
                                wrqu->data.flags = IW_ENCODE_ENABLED;
                                if (key-- > 0) {
                                
                                wrqu->data.flags = IW_ENCODE_ENABLED;
                                if (key-- > 0) {


@@ -473,7 +568,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) {
                                case IW_MODE_MONITOR:
                        
                        switch (wrqu->mode) {
                                case IW_MODE_MONITOR:


@@ -496,10 +591,6 @@ static int wlcompat_ioctl(struct net_device *dev,
                                        ap = 0;
                                        wet = 1;
                                        break;
                                        ap = 0;
                                        wet = 1;
                                        break;

-                               case IW_MODE_SECOND:
-                                       ap = 0;
-                                       infra = 1;
-                                       wds = 1;

                                        
                                default:
                                        return -EINVAL;
                                        
                                default:
                                        return -EINVAL;


@@ -508,7 +599,6 @@ static int wlcompat_ioctl(struct net_device *dev,
                        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));
                        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));

-                       wl_ioctl(dev, WLC_SET_WET, &wds, sizeof(wds));

                        if (ap >= 0) 
                                wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap));
                        if (infra >= 0)
                        if (ap >= 0) 
                                wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap));
                        if (infra >= 0)


@@ -519,7 +609,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)
                                return -EINVAL;
 
                        if (wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0)
                                return -EINVAL;


@@ -529,15 +619,11 @@ static int wlcompat_ioctl(struct net_device *dev,
                                return -EINVAL;
                        if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0)
                                return -EINVAL;
                                return -EINVAL;
                        if (wl_ioctl(dev, WLC_GET_WET, &wet, sizeof(wet)) < 0)
                                return -EINVAL;

-                       if (wl_ioctl(dev, WLC_GET_WET, &wds, sizeof(wds)) < 0)
-                               return -EINVAL;

 
                        if (passive) {
                                wrqu->mode = IW_MODE_MONITOR;
                        } else if (!infra) {
                                wrqu->mode = IW_MODE_ADHOC;
 
                        if (passive) {
                                wrqu->mode = IW_MODE_MONITOR;
                        } else if (!infra) {
                                wrqu->mode = IW_MODE_ADHOC;

-                       } else if (wds) {
-                               wrqu->mode = IW_MODE_SECOND;

                        } else {
                                if (ap) {
                                        wrqu->mode = IW_MODE_MASTER;
                        } else {
                                if (ap) {
                                        wrqu->mode = IW_MODE_MASTER;


@@ -606,10 +692,23 @@ static const iw_handler    wlcompat_handler[] = {
        wlcompat_ioctl,         /* SIOCGIWTXPOW */
        NULL,                   /* SIOCSIWRETRY */
        NULL,                   /* SIOCGIWRETRY */
        wlcompat_ioctl,         /* SIOCGIWTXPOW */
        NULL,                   /* SIOCSIWRETRY */
        NULL,                   /* SIOCGIWRETRY */

-       NULL,                   /* SIOCSIWENCODE */
+       wlcompat_ioctl,         /* SIOCSIWENCODE */

        wlcompat_ioctl,         /* SIOCGIWENCODE */
 };
 
        wlcompat_ioctl,         /* SIOCGIWENCODE */
 };
 

+
+#define WLCOMPAT_SET_MONITOR           SIOCIWFIRSTPRIV + 0
+#define WLCOMPAT_GET_MONITOR           SIOCIWFIRSTPRIV + 1
+#define WLCOMPAT_SET_TXPWR_LIMIT       SIOCIWFIRSTPRIV + 2
+#define WLCOMPAT_GET_TXPWR_LIMIT       SIOCIWFIRSTPRIV + 3
+#define WLCOMPAT_SET_ANTDIV            SIOCIWFIRSTPRIV + 4
+#define WLCOMPAT_GET_ANTDIV            SIOCIWFIRSTPRIV + 5
+#define WLCOMPAT_SET_TXANT             SIOCIWFIRSTPRIV + 6
+#define WLCOMPAT_GET_TXANT             SIOCIWFIRSTPRIV + 7
+#define WLCOMPAT_SET_BSS_FORCE         SIOCIWFIRSTPRIV + 8
+#define WLCOMPAT_GET_BSS_FORCE         SIOCIWFIRSTPRIV + 9
+
+

 static int wlcompat_private_ioctl(struct net_device *dev,
                         struct iw_request_info *info,
                         union iwreq_data *wrqu,
 static int wlcompat_private_ioctl(struct net_device *dev,
                         struct iw_request_info *info,
                         union iwreq_data *wrqu,


@@ -687,6 +786,16 @@ static int wlcompat_private_ioctl(struct net_device *dev,
 
                        break;
                }
 
                        break;
                }

+               case WLCOMPAT_SET_BSS_FORCE:
+               {
+                       bss_force = (unsigned short) *value;
+                       break;
+               }
+               case WLCOMPAT_GET_BSS_FORCE:
+               {
+                       *extra = (int) bss_force;
+                       break;
+               }

                default:
                {
                        return -EINVAL;
                default:
                {
                        return -EINVAL;


@@ -738,6 +847,16 @@ static const struct iw_priv_args wlcompat_private_args[] =
                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
                "get_txant"
        },
                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
                "get_txant"
        },

+       {       WLCOMPAT_SET_BSS_FORCE, 
+               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+               0,
+               "set_bss_force"
+       },
+       {       WLCOMPAT_GET_BSS_FORCE, 
+               0,
+               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+               "get_bss_force"
+       },

 };
 
 static const iw_handler wlcompat_private[] =
 };
 
 static const iw_handler wlcompat_private[] =


@@ -810,6 +929,7 @@ static int __init wlcompat_init()
 {
        int found = 0, i;
        char *devname = "eth0";
 {
        int found = 0, i;
        char *devname = "eth0";

+       bss_force = 0;

        
        while (!found && (dev = dev_get_by_name(devname))) {
                if ((dev->wireless_handlers == NULL) && ((wl_ioctl(dev, WLC_GET_MAGIC, &i, sizeof(i)) == 0) && i == WLC_IOCTL_MAGIC))
        
        while (!found && (dev = dev_get_by_name(devname))) {
                if ((dev->wireless_handlers == NULL) && ((wl_ioctl(dev, WLC_GET_MAGIC, &i, sizeof(i)) == 0) && i == WLC_IOCTL_MAGIC))


@@ -828,7 +948,6 @@ static int __init wlcompat_init()
        dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
 #ifdef DEBUG
        printk("broadcom driver private data: 0x%08x\n", dev->priv);
        dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
 #ifdef DEBUG
        printk("broadcom driver private data: 0x%08x\n", dev->priv);

-       print_buffer(200, dev->priv);

 #endif
        return 0;
 }
 #endif
        return 0;
 }