fix whitespace order in cflags without CONFIG_DEBUG to prevent breakage in some packa...

[openwrt.git] / package / broadcom-wl / src / wlcompat / wlcompat.c

diff --git a/package/broadcom-wl/src/wlcompat/wlcompat.c b/package/broadcom-wl/src/wlcompat/wlcompat.c
index 3e869ea..5d2e74d 100644 (file)
--- a/package/broadcom-wl/src/wlcompat/wlcompat.c
+++ b/package/broadcom-wl/src/wlcompat/wlcompat.c
@@ -30,6 +30,7 @@
 #include <linux/wireless.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/wireless.h>
 #include <linux/timer.h>
 #include <linux/delay.h>

+#include <linux/random.h>

 #include <net/iw_handler.h>
 #include <asm/uaccess.h>
 
 #include <net/iw_handler.h>
 #include <asm/uaccess.h>
 


@@ -37,14 +38,15 @@
 #include <bcmutils.h>
 #include <wlioctl.h>
 
 #include <bcmutils.h>
 #include <wlioctl.h>
 

+char buf[WLC_IOCTL_MAXLEN];

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

-static struct iw_statistics wstats;

 #ifndef DEBUG
 static int random = 1;
 #endif
 #ifndef DEBUG
 static int random = 1;
 #endif

+#ifndef WL_WEXT
+static struct iw_statistics wstats;

 static int last_mode = -1;
 static int scan_cur = 0;
 static int last_mode = -1;
 static int scan_cur = 0;

-char buf[WLC_IOCTL_MAXLEN];

 
 /* The frequency of each channel in MHz */
 const long channel_frequency[] = {
 
 /* The frequency of each channel in MHz */
 const long channel_frequency[] = {


@@ -52,6 +54,7 @@ const long channel_frequency[] = {
        2447, 2452, 2457, 2462, 2467, 2472, 2484
 };
 #define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )
        2447, 2452, 2457, 2462, 2467, 2472, 2484
 };
 #define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )

+#endif

 
 #define SCAN_RETRY_MAX 5
 #define RNG_POLL_FREQ  1
 
 #define SCAN_RETRY_MAX 5
 #define RNG_POLL_FREQ  1


@@ -88,6 +91,7 @@ static int wl_ioctl(struct net_device *dev, int cmd, void *buf, int len)
        return ret;
 }
 
        return ret;
 }
 

+#if !defined(DEBUG) || !defined(WL_WEXT)

 static int
 wl_iovar_getbuf(struct net_device *dev, char *iovar, void *param, int paramlen, void *bufptr, int buflen)
 {
 static int
 wl_iovar_getbuf(struct net_device *dev, char *iovar, void *param, int paramlen, void *bufptr, int buflen)
 {


@@ -268,6 +272,9 @@ wl_bssiovar_get(struct net_device *dev, char *iovar, int bssidx, void *outbuf, i
        return err;
 }
 #endif
        return err;
 }
 #endif

+#endif
+
+#ifndef WL_WEXT

 
 int get_primary_key(struct net_device *dev)
 {
 
 int get_primary_key(struct net_device *dev)
 {


@@ -778,7 +785,8 @@ static int wlcompat_ioctl(struct net_device *dev,
                case SIOCSIWMODE:
                {
                        int ap = -1, infra = -1, passive = 0, wet = 0;
                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;
                        switch (wrqu->mode) {
                                case IW_MODE_MONITOR:
                                        passive = 1;


@@ -794,27 +802,27 @@ static int wlcompat_ioctl(struct net_device *dev,
                                case IW_MODE_INFRA:
                                        infra = 1;
                                        ap = 0;
                                case IW_MODE_INFRA:
                                        infra = 1;
                                        ap = 0;

+                                       wet = 0;

                                        break;
                                case IW_MODE_REPEAT:
                                        infra = 1;
                                        ap = 0;
                                        wet = 1;
                                        break;
                                        break;
                                case IW_MODE_REPEAT:
                                        infra = 1;
                                        ap = 0;
                                        wet = 1;
                                        break;

-                                       

                                default:
                                        return -EINVAL;
                        }
                                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_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;
                                wl_ioctl(dev, WLC_SET_AP, &ap, sizeof(ap));
                        if (infra >= 0)
                                wl_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(infra));
 
                        break;

-                                               

                }
                case SIOCGIWMODE:
                {
                }
                case SIOCGIWMODE:
                {


@@ -826,8 +834,6 @@ static int wlcompat_ioctl(struct net_device *dev,
                                return -EINVAL;
                        if (wl_ioctl(dev, WLC_GET_PASSIVE, &passive, sizeof(passive)) < 0)
                                return -EINVAL;
                                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;
 
                        if (passive) {
                                wrqu->mode = IW_MODE_MONITOR;


@@ -837,11 +843,7 @@ static int wlcompat_ioctl(struct net_device *dev,
                                if (ap) {
                                        wrqu->mode = IW_MODE_MASTER;
                                } else {
                                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;
                                }
                        }
                        break;


@@ -908,6 +910,7 @@ static const struct iw_handler_def wlcompat_handler_def =
        .num_standard   = sizeof(wlcompat_handler)/sizeof(iw_handler),
 };
 
        .num_standard   = sizeof(wlcompat_handler)/sizeof(iw_handler),
 };
 

+#endif

 
 #ifdef DEBUG
 void print_buffer(int len, unsigned char *buf) {
 
 #ifdef DEBUG
 void print_buffer(int len, unsigned char *buf) {


@@ -928,8 +931,6 @@ void print_buffer(int len, unsigned char *buf) {
 static int (*old_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);
 static int new_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) {
        int ret = 0;
 static int (*old_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);
 static int new_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) {
        int ret = 0;

-       struct iwreq *iwr = (struct iwreq *) ifr;
-       struct iw_request_info info;

        
 #ifdef DEBUG
        printk("dev: %s ioctl: 0x%04x\n",dev->name,cmd);
        
 #ifdef DEBUG
        printk("dev: %s ioctl: 0x%04x\n",dev->name,cmd);


@@ -980,23 +981,25 @@ static int __init wlcompat_init()
 {
        int found = 0, i;
        char devname[4] = "wl0";
 {
        int found = 0, i;
        char devname[4] = "wl0";

-       
+

        while (!found && (dev = dev_get_by_name(devname))) {
        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))
+               if ((wl_ioctl(dev, WLC_GET_MAGIC, &i, sizeof(i)) == 0) && (i == WLC_IOCTL_MAGIC))

                        found = 1;
                devname[2]++;
        }
                        found = 1;
                devname[2]++;
        }

-       
+
+

        if (!found) {
                printk("No Broadcom devices found.\n");
                return -ENODEV;
        }
        if (!found) {
                printk("No Broadcom devices found.\n");
                return -ENODEV;
        }

-               

 
        old_ioctl = dev->do_ioctl;
        dev->do_ioctl = new_ioctl;
 
        old_ioctl = dev->do_ioctl;
        dev->do_ioctl = new_ioctl;

+#ifndef WL_WEXT        

        dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
        dev->get_wireless_stats = wlcompat_get_wireless_stats;
        dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
        dev->get_wireless_stats = wlcompat_get_wireless_stats;

+#endif

 
 #ifndef DEBUG
        if (random) {
 
 #ifndef DEBUG
        if (random) {


@@ -1019,8 +1022,10 @@ static void __exit wlcompat_exit()
        if (random)
                del_timer(&rng_timer);
 #endif
        if (random)
                del_timer(&rng_timer);
 #endif

+#ifndef WL_WEXT        

        dev->get_wireless_stats = NULL;
        dev->wireless_handlers = NULL;
        dev->get_wireless_stats = NULL;
        dev->wireless_handlers = NULL;

+#endif

        dev->do_ioctl = old_ioctl;
        return;
 }
        dev->do_ioctl = old_ioctl;
        return;
 }