From owner-svn-src-head@freebsd.org Mon Feb 29 21:17:40 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECB15AB7BA9; Mon, 29 Feb 2016 21:17:40 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B869BB92; Mon, 29 Feb 2016 21:17:40 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1TLHda3096148; Mon, 29 Feb 2016 21:17:39 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1TLHdYc096147; Mon, 29 Feb 2016 21:17:39 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201602292117.u1TLHdYc096147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Mon, 29 Feb 2016 21:17:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296239 - head/sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Feb 2016 21:17:41 -0000 Author: avos Date: Mon Feb 29 21:17:39 2016 New Revision: 296239 URL: https://svnweb.freebsd.org/changeset/base/296239 Log: net80211: do not enforce promiscuous mode for AP scan Drivers should set their own filters via ic_scan_start()/ic_scan_end() callbacks; and we don't need frames other than beacons or probe responses. (Note: this was a noop since r287197 due to promiscuous mode with bridge workaround) Tested with Intel 3945BG, RTL8188EU and WUSB54GC in HOSTAP mode. Approved by: adrian (mentor) Differential Revision: https://reviews.freebsd.org/D5474 Modified: head/sys/net80211/ieee80211_scan_sta.c Modified: head/sys/net80211/ieee80211_scan_sta.c ============================================================================== --- head/sys/net80211/ieee80211_scan_sta.c Mon Feb 29 21:10:47 2016 (r296238) +++ head/sys/net80211/ieee80211_scan_sta.c Mon Feb 29 21:17:39 2016 (r296239) @@ -1714,7 +1714,6 @@ ap_start(struct ieee80211_scan_state *ss st->st_scangen++; st->st_newscan = 1; - ieee80211_promisc(vap, true); return 0; } @@ -1724,7 +1723,6 @@ ap_start(struct ieee80211_scan_state *ss static int ap_cancel(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) { - ieee80211_promisc(vap, false); return 0; } @@ -1798,7 +1796,6 @@ ap_end(struct ieee80211_scan_state *ss, return 0; } } - ieee80211_promisc(vap, false); if (ss->ss_flags & (IEEE80211_SCAN_NOPICK | IEEE80211_SCAN_NOJOIN)) { /* * Manual/background scan, don't select+join the