From owner-svn-src-all@FreeBSD.ORG Tue Dec 10 13:38:39 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA9799C2; Tue, 10 Dec 2013 13:38:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9647E1CD3; Tue, 10 Dec 2013 13:38:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBADcd6J053329; Tue, 10 Dec 2013 13:38:39 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBADcdH3053328; Tue, 10 Dec 2013 13:38:39 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201312101338.rBADcdH3053328@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 10 Dec 2013 13:38:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r259174 - stable/10/sys/net80211 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 13:38:39 -0000 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 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