svn commit: r196004 - head/sys/net80211

[Sam Leffler]

Author: sam
Date: Fri Jul 31 19:12:19 2009
New Revision: 196004
URL: http://svn.freebsd.org/changeset/base/196004

Log:
  Filter setting IFF_PROMISC on tdma vaps; we don't want the underyling device
  to be in promiscuous mode as we have a h/w bssid.
  
  Approved by:	re (kib)

Modified:
  head/sys/net80211/ieee80211.c

Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c	Fri Jul 31 17:57:16 2009	(r196003)
+++ head/sys/net80211/ieee80211.c	Fri Jul 31 19:12:19 2009	(r196004)
@@ -638,7 +638,8 @@ ieee80211_syncifflag_locked(struct ieee8
 			 */
 			if (flag == IFF_PROMISC &&
 			    !(vap->iv_opmode == IEEE80211_M_MONITOR ||
-			      vap->iv_opmode == IEEE80211_M_AHDEMO))
+			      (vap->iv_opmode == IEEE80211_M_AHDEMO &&
+			       (vap->iv_caps & IEEE80211_C_TDMA) == 0)))
 				continue;
 			bit = 1;
 			break;