Changeset 2757

Timestamp:

10/17/07 22:45:47 (1 year ago)

Author:

benoit

Message:

Separate FCC/ETSI radar patterns list. Ignored pulses with width being 0 or 255

Files:

• madwifi/branches/madwifi-dfs/ath/Makefile (modified) (1 diff)
• madwifi/branches/madwifi-dfs/ath/if_ath_radar.c (modified) (4 diffs)

madwifi/branches/madwifi-dfs/ath/Makefile

@@ -55 +55 @@
-endif
-
+# You need to either define DFS_DOMAIN_ETSI or DFS_DOMAIN_FCC
+COPTS   += -DDFS_DOMAIN_ETSI
+
-include $(TOP)/Makefile.inc
-

madwifi/branches/madwifi-dfs/ath/if_ath_radar.c

@@ -125 +125 @@
-
-static struct radar_pattern_specification radar_patterns[] = {
+#ifdef DFS_DOMAIN_ETSI
-        {"ETSI [ 200]", 4900, 5100, AH_TRUE, 20, 3, 4, 10, 4, 8, AH_TRUE},
-        {"ETSI [ 300]", 3267, 3399, AH_TRUE, 20, 3, 4, 10, 4, 6, AH_TRUE},
@@ -139 +140 @@
-        {"ETSI [3500]", 280, 290, AH_TRUE, 20, 4, 4, 25, 2, 20, AH_TRUE},
-        {"ETSI [4000]", 245, 255, AH_TRUE, 20, 4, 4, 25, 5, 20, AH_TRUE},
+#endif
+#ifdef DFS_DOMAIN_FCC
-        {"FCC [1,1399-1714]", 1399, 1714, AH_TRUE, 10, 5, 10, 18, 4, 6, AH_FALSE},
-        {"FCC [2,147-235]", 147, 235, AH_TRUE, 10, 8, 10, 29, 6, 12, AH_FALSE},
@@ -148 +151 @@
-        {"FCC [3-4,314-392]", 314, 392, AH_TRUE, 10, 8, 8, 18, 2, 16, AH_FALSE},
-        {"FCC [3-4,393-471]", 393, 471, AH_TRUE, 10, 8, 8, 18, 2, 16, AH_FALSE}
+#endif
-};
-
@@ -1558 +1562 @@
-                DEV_NAME(dev), tsf, rssi, width);
-
+        /* pulses with 0 or 255 width seems to trigger false detection of
+         * radar. we ignored it then. */
+
+        if (width==0 || width==255) {
+                /* ignored */
+                return ;
+        }
+
-        /* check if the new radar pulse is after the last one recorded, or
-         * else, we flush the history */