Merge -dfs to trunk - r3116

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3117 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/ath/if_ath.c b/ath/if_ath.c
index 4292e2360cd2218afe8da72f24b1521e4f7746d2..b988249013d367fee94cd8937a18e4f75efdb0d0 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -6193,6 +6193,11 @@ rx_accept:
                        sc->sc_stats.ast_rx_tooshort++;
                        ieee80211_dev_kfree_skb(&skb);
                        goto rx_next;
+                       if (sc->sc_ic.ic_opmode == IEEE80211_M_MONITOR) {
+                               /* no other VAPs need the packet */
+                               ieee80211_dev_kfree_skb(&skb);
+                               goto rx_next;
+                       }
                }
 #endif
                ath_capture(dev, bf, skb, bf->bf_tsf, 0 /* RX */);