svn commit: r195223 - projects/mesh11s/sys/net80211

[Sam Leffler]

Author: sam
Date: Wed Jul  1 01:29:06 2009
New Revision: 195223
URL: http://svn.freebsd.org/changeset/base/195223

Log:
  update bpf/radiotap support

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jul  1 01:27:27 2009	(r195222)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jul  1 01:29:06 2009	(r195223)
@@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_llc.h>
 #include <net/ethernet.h>
 
-#include <net/bpf.h>
-
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_mesh.h>
 #include <net80211/ieee80211_hwmp.h>
@@ -577,8 +575,9 @@ deliver:
 			}
 		}
 		wh = NULL;		/* no longer valid, catch any uses */
-		if (bpf_peers_present(vap->iv_rawbpf))
-			bpf_mtap(vap->iv_rawbpf, m);
+
+		if (ieee80211_radiotap_active_vap(vap))
+			ieee80211_radiotap_rx(vap, m);
 		need_tap = 0;
 
 		/*
@@ -641,8 +640,6 @@ deliver:
 			vap->iv_stats.is_rx_mgtdiscard++; /* XXX */
 			goto out;
 		}
-		if (bpf_peers_present(vap->iv_rawbpf))
-			bpf_mtap(vap->iv_rawbpf, m);
 		vap->iv_recv_mgmt(ni, m, subtype, rssi, noise);
 		goto out;
 	case IEEE80211_FC0_TYPE_CTL:
@@ -659,8 +656,8 @@ err:
 	ifp->if_ierrors++;
 out:
 	if (m != NULL) {
-		if (bpf_peers_present(vap->iv_rawbpf) && need_tap)
-			bpf_mtap(vap->iv_rawbpf, m);
+		if (need_tap && ieee80211_radiotap_active_vap(vap))
+			ieee80211_radiotap_rx(vap, m);
 		m_freem(m);
 	}
 	return type;