improve signal level/quality display

[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 b5f9bff..d86a9bd 100644 (file)
--- a/openwrt/target/linux/package/wlcompat/wlcompat.c
+++ b/openwrt/target/linux/package/wlcompat/wlcompat.c
@@ -34,6 +34,7 @@
 
 static struct net_device *dev;
 static unsigned short bss_force;
+static struct iw_statistics wstats;
 char buf[WLC_IOCTL_MAXLEN];
 
 /* The frequency of each channel in MHz */
@@ -138,6 +139,7 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
        struct iw_range *range;
 
        range = (struct iw_range *) extra;
+       bzero(extra, sizeof(struct iw_range));
 
        range->we_version_compiled = WIRELESS_EXT;
        range->we_version_source = WIRELESS_EXT;
@@ -167,6 +169,10 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
        range->min_pmt = 0;
        range->max_pmt = 65535 * 1000;
 
+       range->max_qual.qual = 0;
+       range->max_qual.level = 0;
+       range->max_qual.noise = 0;
+       
        range->min_rts = 0;
        if (wl_ioctl(dev, WLC_GET_RTS, &range->max_rts, sizeof(int)) < 0)
                range->max_rts = 2347;
@@ -216,6 +222,46 @@ static int wlcompat_set_scan(struct net_device *dev,
 }
 
 
+struct iw_statistics *wlcompat_get_wireless_stats(struct net_device *dev)
+{
+       wl_bss_info_t *bss_info = (wl_bss_info_t *) buf;
+       get_pktcnt_t pkt;
+       unsigned int rssi, noise, ap;
+       
+       memset(&wstats, 0, sizeof(wstats));
+       memset(&pkt, 0, sizeof(pkt));
+       memset(buf, 0, sizeof(buf));
+       bss_info->version = 0x2000;
+       wl_ioctl(dev, WLC_GET_BSS_INFO, bss_info, WLC_IOCTL_MAXLEN);
+       wl_ioctl(dev, WLC_GET_PKTCNTS, &pkt, sizeof(pkt));
+
+       rssi = 0;
+       if ((wl_ioctl(dev, WLC_GET_AP, &ap, sizeof(ap)) < 0) || ap) {
+               if (wl_ioctl(dev, WLC_GET_PHY_NOISE, &noise, sizeof(noise)) < 0)
+                       noise = 0;
+       } else {
+               // somehow the structure doesn't fit here
+               rssi = buf[82];
+               noise = buf[84];
+       }
+       rssi = (rssi == 0 ? 1 : rssi);
+       wstats.qual.updated = 0x10;
+       if (rssi <= 1) 
+               wstats.qual.updated |= 0x20;
+       if (noise <= 1)
+               wstats.qual.updated |= 0x40;
+
+       if ((wstats.qual.updated & 0x60) == 0x60)
+               return NULL;
+
+       wstats.qual.level = rssi;
+       wstats.qual.noise = noise;
+       wstats.discard.misc = pkt.rx_bad_pkt;
+       wstats.discard.retries = pkt.tx_bad_pkt;
+
+       return &wstats;
+}
+
 static int wlcompat_get_scan(struct net_device *dev,
                         struct iw_request_info *info,
                         union iwreq_data *wrqu,
@@ -229,7 +275,10 @@ static int wlcompat_get_scan(struct net_device *dev,
        char *end_buf = extra + IW_SCAN_MAX_DATA;
        struct iw_event iwe;
        int i, j;
-
+       int rssi, noise;
+       
+       results->buflen = WLC_IOCTL_MAXLEN - sizeof(wl_scan_results_t);
+       
        if (wl_ioctl(dev, WLC_SCAN_RESULTS, buf, WLC_IOCTL_MAXLEN) < 0)
                return -EAGAIN;
        
@@ -259,9 +308,9 @@ static int wlcompat_get_scan(struct net_device *dev,
 
                /* add quality statistics */
                iwe.cmd = IWEVQUAL;
+               iwe.u.qual.qual = 0;
                iwe.u.qual.level = bss_info->RSSI;
                iwe.u.qual.noise = bss_info->phy_noise;
-               iwe.u.qual.qual = 0;
                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
        
                /* send rate information */
@@ -701,10 +750,10 @@ static const iw_handler    wlcompat_handler[] = {
 #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_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
 
@@ -946,6 +995,7 @@ static int __init wlcompat_init()
        old_ioctl = dev->do_ioctl;
        dev->do_ioctl = new_ioctl;
        dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
+       dev->get_wireless_stats = wlcompat_get_wireless_stats;
 #ifdef DEBUG
        printk("broadcom driver private data: 0x%08x\n", dev->priv);
 #endif
@@ -954,6 +1004,7 @@ static int __init wlcompat_init()
 
 static void __exit wlcompat_exit()
 {
+       dev->get_wireless_stats = NULL;
        dev->wireless_handlers = NULL;
        dev->do_ioctl = old_ioctl;
        return;