Changeset 3632

Timestamp:

05/16/08 16:07:50 (5 months ago)

Author:

benoit

Message:

Fixed a bug where packet injection was no longer working when DFS was enabled.
This can potentially breaks DFS implementation (it has to be tested again)

Files:

• madwifi/branches/madwifi-dfs/README.dfs (modified) (2 diffs)
• madwifi/branches/madwifi-dfs/ath/if_ath.c (modified) (3 diffs)

madwifi/branches/madwifi-dfs/README.dfs

@@ -2 +2 @@
-
-Conformance testing to the following standards:
-
-
+
+
+
+
+
+
+
+
-
-Frequencies & channels where DFS is applicable:
@@ -19 +25 @@
-Simulating a radar detected event:
-iwpriv wlan0 doth_radar
+
+== Notes on DFS in various modes ==
+
+A VAP interface can be used in several modes:
+* IEEE80211_M_STA "sta"         : DFS is implemented as "slave"
+* IEEE80211_M_IBSS "adhoc"      : DFS is implemented as "master"
+* IEEE80211_M_AHDEMO "ahdemo"   : DFS is implemented as "master"
+* IEEE80211_M_HOSTAP "ap"       : DFS is implemented as "master"
+* IEEE80211_M_MONITOR "monitor" : DFS is not implemented
+* IEEE80211_M_WDS "wds"         : DFS is implemented as "master"
+

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

@@ -3203 +3203 @@
-
-        if (!ath_dfs_can_transmit_csaie_dbgmsg(sc)) {
-
+
+
+
+
+
-                        "%s: WE ARE SENDING PACKETS UNDER CAC!\n", __func__);
-                return;
-        }
-
@@ -3624 +3627 @@
-        STAILQ_INIT(&bf_head);
-
+        /* We send injected packets before checking DFS rules. It means that
+         * packet injection bypass DFS rules */
+        if (SKB_CB(skb)->flags & M_RAW) {
+                bf = ath_take_txbuf(sc);
+                if (bf == NULL) {
+                        /* All DMA buffers full, safe to try again. */
+                        requeue = 1;
+                        goto hardstart_fail;
+                }
+                ath_tx_startraw(dev, bf, skb);
+                return NETDEV_TX_OK;
+        }
+
-        /* If we are under CAC or have detected a radar, we simply drop (and
-
+
+
-        if (!ath_dfs_can_transmit_dbgmsg(sc)) {
-                /* No need to print a warning or error messages here since we
@@ -3632 +3649 @@
-                 * dropped without exception. */
-                goto hardstart_fail;
-        }
-
-        if (SKB_CB(skb)->flags & M_RAW) {
-                bf = ath_take_txbuf(sc);
-                if (bf == NULL) {
-                        /* All DMA buffers full, safe to try again. */
-                        requeue = 1;
-                        goto hardstart_fail;
-                }
-                ath_tx_startraw(dev, bf, skb);
-                return NETDEV_TX_OK;
-        }
-