Date: Tue, 6 Apr 2010 14:07:48 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r206271 - stable/8/sys/net80211 Message-ID: <201004061407.o36E7m67086378@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Tue Apr 6 14:07:48 2010 New Revision: 206271 URL: http://svn.freebsd.org/changeset/base/206271 Log: MFC r203422, r205516: When receiving a management frame, pass the mbuf to bpf before calling iv_recv_mgmt(). iv_recv_mgmt() will generate management frame responses and pass them to bpf before the management frame that triggered the response. PR: 144323 Submitted by: Alexander Egorenkov <egorenar at gmail.com> Sponsored by: iXsystems, inc. Modified: stable/8/sys/net80211/ieee80211_hostap.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/net80211/ieee80211_hostap.c ============================================================================== --- stable/8/sys/net80211/ieee80211_hostap.c Tue Apr 6 13:12:11 2010 (r206270) +++ stable/8/sys/net80211/ieee80211_hostap.c Tue Apr 6 14:07:48 2010 (r206271) @@ -884,6 +884,14 @@ hostap_input(struct ieee80211_node *ni, wh = mtod(m, struct ieee80211_frame *); wh->i_fc[1] &= ~IEEE80211_FC1_WEP; } + /* + * Pass the packet to radiotap before calling iv_recv_mgmt(). + * Otherwise iv_recv_mgmt() might pass another packet to + * radiotap, resulting in out of order packet captures. + */ + if (ieee80211_radiotap_active_vap(vap)) + ieee80211_radiotap_rx(vap, m); + need_tap = 0; vap->iv_recv_mgmt(ni, m, subtype, rssi, nf); goto out;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004061407.o36E7m67086378>