summaryrefslogtreecommitdiffstats
path: root/sys/net80211/ieee80211_monitor.c
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2009-05-25 16:38:47 +0000
committersam <sam@FreeBSD.org>2009-05-25 16:38:47 +0000
commitc16474afa051485a6b6bb1b5228e59f1e8b30927 (patch)
tree2e0eaf018173b7a9aac32f2e0adcc48f0bf3bc7c /sys/net80211/ieee80211_monitor.c
parent1dcc1a56a6b94b2719df947054688a1478e503cb (diff)
downloadFreeBSD-src-c16474afa051485a6b6bb1b5228e59f1e8b30927.zip
FreeBSD-src-c16474afa051485a6b6bb1b5228e59f1e8b30927.tar.gz
Fix handling of devices w/o radiotap support:
o do not attach DLT_IEEE802_11_RADIO unless both tx and rx headers are present; this is assumed in the capture code paths o verify the above with asserts in ieee80211_radiotap_{rx,tx} o add missing checks for active taps before calling ieee80211_radiotap_rx
Diffstat (limited to 'sys/net80211/ieee80211_monitor.c')
-rw-r--r--sys/net80211/ieee80211_monitor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_monitor.c b/sys/net80211/ieee80211_monitor.c
index 119c87d..3f2c847 100644
--- a/sys/net80211/ieee80211_monitor.c
+++ b/sys/net80211/ieee80211_monitor.c
@@ -128,7 +128,8 @@ monitor_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
{
struct ieee80211vap *vap = ni->ni_vap;
- ieee80211_radiotap_rx(vap, m);
+ if (ieee80211_radiotap_active_vap(vap))
+ ieee80211_radiotap_rx(vap, m);
m_freem(m);
return -1;
}
OpenPOWER on IntegriCloud