Date: Tue, 10 Dec 2013 19:17:32 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259187 - releng/10.0/sys/net80211 Message-ID: <201312101917.rBAJHWGV077974@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Tue Dec 10 19:17:31 2013 New Revision: 259187 URL: http://svnweb.freebsd.org/changeset/base/259187 Log: Merge r259174 from stable/10 (head r256294 by adrian): Fix the "am I a net80211 vap" check for bpf listeners. I changed it to use if_transmit a while ago but apparently with monitor mode the if_transmit method is overridden. This is (mostly) a workaround until a more permanent solution can be found. Submitted by: Patrick Kelsey <kelsey@ieee.org> Approved by: re (glebius) Modified: releng/10.0/sys/net80211/ieee80211_freebsd.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/net80211/ieee80211_freebsd.c ============================================================================== --- releng/10.0/sys/net80211/ieee80211_freebsd.c Tue Dec 10 19:15:26 2013 (r259186) +++ releng/10.0/sys/net80211/ieee80211_freebsd.c Tue Dec 10 19:17:31 2013 (r259187) @@ -808,9 +808,9 @@ static eventhandler_tag wlan_ifllevent; static void bpf_track(void *arg, struct ifnet *ifp, int dlt, int attach) { - /* NB: identify vap's by if_start */ + /* NB: identify vap's by if_init */ if (dlt == DLT_IEEE802_11_RADIO && - ifp->if_transmit == ieee80211_vap_transmit) { + ifp->if_init == ieee80211_init) { struct ieee80211vap *vap = ifp->if_softc; /* * Track bpf radiotap listener state. We mark the vap
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312101917.rBAJHWGV077974>