svn commit: r259174 - stable/10/sys/net80211

[Gavin Atkinson]

Author: gavin
Date: Tue Dec 10 13:38:39 2013
New Revision: 259174
URL: http://svnweb.freebsd.org/changeset/base/259174

Log:
  Merge r256294 (by adrian) from head:
  
    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.
  
  Candidate for 10.0.
  
  Submitted by:	Patrick Kelsey <kelsey at ieee.org>

Modified:
  stable/10/sys/net80211/ieee80211_freebsd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net80211/ieee80211_freebsd.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_freebsd.c	Tue Dec 10 13:36:56 2013	(r259173)
+++ stable/10/sys/net80211/ieee80211_freebsd.c	Tue Dec 10 13:38:39 2013	(r259174)
@@ -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