svn commit: r296239 - head/sys/net80211

[Andriy Voskoboinyk]

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