Changeset 19052 for src/router/services/tools/site_survey_broadcom.c

Timestamp:

04/18/12 23:32:05 (14 months ago)

Author:

BrainSlayer

Message:

fix 5 ghz scanning (takes longer than normal)

File:

• src/router/services/tools/site_survey_broadcom.c (modified) (2 diffs)

src/router/services/tools/site_survey_broadcom.c

@@ -425 +425 @@
         }
         params.bss_type = DOT11_BSSTYPE_ANY;
-        params.scan_type = -1;
+        params.scan_type = 0;
         params.nprobes = -1;
         params.active_time = -1;
         params.passive_time = -1;
         params.home_time = -1;
+        params.channel_num = 0;
 
         /*
@@ -438 +439 @@
                 return -1;
         }
-        sleep(1);
-        bzero(buf, sizeof(buf));
-        scan_res->buflen = sizeof(buf);
-
-        if (wl_ioctl(dev, WLC_SCAN_RESULTS, buf, WLC_IOCTL_MAXLEN) < 0) {
-                fprintf(stderr, "scan results failed\n");
-                return -1;
+        int count = 10;
+        int ret = 0;
+        while ((count--) > 0)   //scan for max 5 seconds
+        {
+                usleep(500 * 1000);
+
+                bzero(buf, sizeof(buf));
+                scan_res->buflen = sizeof(buf);
+                ret = wl_ioctl(dev, WLC_SCAN_RESULTS, buf, WLC_IOCTL_MAXLEN);
+                if (!ret)
+                        break;
+        }
+        if (ret < 0) {
+                fprintf(stderr, "scan failed with errorcode %d\n", ret);
         }