Ticket #921: madwifi_monitor_invalid_frames.patch

net80211/ieee80211_monitor.c

@@ -247 +247 @@
-                        /* don't rx fromds, tods, or dstods packets */
-                        continue;
-                }                   
+
+                /* If we have rx'd an error frame... */
+                if (!tx && ds->ds_rxstat.rs_status != 0) {
+                        /* If the vap does not want error frames and
+                         * the error was not a crypto error (which we 
+                         * let through regardless), drop the frame */
+                        if (vap->iv_monitor_invalid_frames == 0 &&
+                                        (ds->ds_rxstat.rs_status &~
+                                         (HAL_RXERR_DECRYPT|HAL_RXERR_MIC))) {
+                                continue;
+                        }
+                }
+                
-                skb1 = skb_copy(skb, GFP_ATOMIC);
-                if (skb1 == NULL) {
-                        /* XXX stat+msg */

net80211/ieee80211_var.h

@@ -313 +313 @@
-
-        int iv_monitor_nods_only;               /* in monitor mode only nods traffic */
-        int iv_monitor_txf_len;                 /* in monitor mode, truncate tx packets */
+        int iv_monitor_invalid_frames;          /* in monitor mode, accept error frames */
-
-        int (*iv_newstate)(struct ieee80211vap *, enum ieee80211_state, int);
-        u_int8_t iv_myaddr[IEEE80211_ADDR_LEN];

net80211/ieee80211_linux.c

@@ -546 +546 @@
-        }
-        return ret;
-}
+static int
+IEEE80211_SYSCTL_DECL(ieee80211_sysctl_monitor_invalid_frames, ctl, write, filp, buffer,
+        lenp, ppos)
+{
+        struct ieee80211vap *vap = ctl->extra1;
+        u_int val;
+        int ret;
-
+        ctl->data = &val;
+        ctl->maxlen = sizeof(val);
+        if (write) {
+                ret = IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer,
+                        lenp, ppos);
+                if (ret == 0)
+                        vap->iv_monitor_invalid_frames = val;
+        } else {
+                val = vap->iv_monitor_invalid_frames;
+                ret = IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer,
+                        lenp, ppos);
+        }
+        return ret;
+}
+
+
-#define CTL_AUTO        -2      /* cannot be CTL_ANY or CTL_NONE */
-
-static const ctl_table ieee80211_sysctl_template[] = {
@@ -572 +595 @@
-          .mode         = 0644,
-          .proc_handler = ieee80211_sysctl_monitor_txf_len
-        },
+        { .ctl_name     = CTL_AUTO,
+          .procname     = "monitor_invalid_frames",
+          .mode         = 0644,
+          .proc_handler = ieee80211_sysctl_monitor_invalid_frames
+        },
-        /* NB: must be last entry before NULL */
-        { .ctl_name     = CTL_AUTO,
-          .procname     = "%parent",

ath/if_ath.c

@@ -5502 +5502 @@
-#endif
-                                }
-                        }
-
-
-
-
+
+
+
+
+
+
-                         */
-
-
-
+
-                                goto rx_next;
-                }
-rx_accept:
@@ -5558 +5558 @@
-                        }
-                }
-
+                /* Reject error frames */
+                if (ds->ds_rxstat.rs_status != 0) {
+                        dev_kfree_skb(skb);
+                        skb = NULL;
+                        goto rx_next;
+                }
+
-                /* remove the crc */
-                skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
-