svn commit: r195549 - projects/mesh11s/sys/net80211

[Rui Paulo]

Author: rpaulo
Date: Fri Jul 10 11:30:55 2009
New Revision: 195549
URL: http://svn.freebsd.org/changeset/base/195549

Log:
  Kill mesh_update_beacon and use hostap code.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Fri Jul 10 11:25:57 2009	(r195548)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Fri Jul 10 11:30:55 2009	(r195549)
@@ -2834,10 +2834,8 @@ ieee80211_beacon_update(struct ieee80211
 		ieee80211_tdma_update_beacon(vap, bo);
 	}
 #endif
-	if (vap->iv_opmode == IEEE80211_M_MBSS) {
-		/*ieee80211_mesh_update_beacon(vap, bo);*/
-	}
-	if (vap->iv_opmode == IEEE80211_M_HOSTAP) {	/* NB: no IBSS support*/
+	if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
+	    vap->iv_opmode == IEEE80211_M_MBSS) {	/* NB: no IBSS support*/
 		struct ieee80211_tim_ie *tie =
 			(struct ieee80211_tim_ie *) bo->bo_tim;
 		if (isset(bo->bo_flags, IEEE80211_BEACON_TIM)) {