svn commit: r188469 - in projects/vap7/sys: dev/ath/ath_hal net80211

[Sam Leffler]

Author: sam
Date: Tue Feb 10 23:58:00 2009
New Revision: 188469
URL: http://svn.freebsd.org/changeset/base/188469

Log:
  revert spammage in r188468

Modified:
  projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_adhoc.c
  projects/vap7/sys/net80211/ieee80211_tdma.c

Modified: projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c
==============================================================================
--- projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c	Tue Feb 10 23:55:23 2009	(r188468)
+++ projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c	Tue Feb 10 23:58:00 2009	(r188469)
@@ -786,10 +786,8 @@ static REG_DMN_FREQ_BAND regDmn5GhzFreq[
  * 5GHz Turbo (dynamic & static) tags
  */
 static REG_DMN_FREQ_BAND regDmn5GhzTurboFreq[] = {
-	{ 4950, 4980, 30, 6, 40, 40, NO_DFS, PSCAN_FCC },
-#define	T1_4950_4980	0
 	{ 5130, 5210, 5,  6, 40, 40, NO_DFS, NO_PSCAN },
-#define	T1_5130_5210	AFTER(T1_4950_4980)
+#define	T1_5130_5210	0
 	{ 5250, 5330, 5,  6, 40, 40, DFS_FCC3, NO_PSCAN },
 #define	T1_5250_5330	AFTER(T1_5130_5210)
 	{ 5370, 5490, 5,  6, 40, 40, NO_DFS, NO_PSCAN },
@@ -1045,8 +1043,7 @@ static REG_DOMAIN regDomains[] = {
 				      F3_5120_5240,
 				      F3_5260_5700,
 				      F8_5745_5825),
-	 .chan11a_turbo		= BM9(T1_4950_4980,
-				      T1_5130_5210,
+	 .chan11a_turbo		= BM8(T1_5130_5210,
 				      T1_5250_5330,
 				      T1_5370_5490,
 				      T1_5530_5650,

Modified: projects/vap7/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_adhoc.c	Tue Feb 10 23:55:23 2009	(r188468)
+++ projects/vap7/sys/net80211/ieee80211_adhoc.c	Tue Feb 10 23:58:00 2009	(r188469)
@@ -110,15 +110,6 @@ adhoc_vattach(struct ieee80211vap *vap)
 #endif
 }
 
-static void
-sta_leave(void *arg, struct ieee80211_node *ni)
-{
-	struct ieee80211vap *vap = arg;
-
-	if (ni->ni_vap == vap && ni != vap->iv_bss)
-		ieee80211_node_leave(ni);
-}
-
 /*
  * IEEE80211_M_IBSS+IEEE80211_M_AHDEMO vap state machine handler.
  */
@@ -155,11 +146,8 @@ adhoc_newstate(struct ieee80211vap *vap,
 		break;
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
-		case IEEE80211_S_RUN:		/* beacon miss */
-			/* purge station table; entries are stale */
-			ieee80211_iterate_nodes(&ic->ic_sta, sta_leave, vap);
-			/* fall thru... */
 		case IEEE80211_S_INIT:
+		case IEEE80211_S_RUN:		/* beacon miss */
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
 			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
 				/*

Modified: projects/vap7/sys/net80211/ieee80211_tdma.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_tdma.c	Tue Feb 10 23:55:23 2009	(r188468)
+++ projects/vap7/sys/net80211/ieee80211_tdma.c	Tue Feb 10 23:58:00 2009	(r188469)
@@ -173,15 +173,6 @@ tdma_vdetach(struct ieee80211vap *vap)
 	setackpolicy(vap->iv_ic, 0);	/* enable ACK's */
 }
 
-static void
-sta_leave(void *arg, struct ieee80211_node *ni)
-{
-	struct ieee80211vap *vap = arg;
-
-	if (ni->ni_vap == vap && ni != vap->iv_bss)
-		ieee80211_node_leave(ni);
-}
-
 /*
  * TDMA state machine handler.
  */
@@ -189,11 +180,10 @@ static int
 tdma_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211_tdma_state *ts = vap->iv_tdma;
-	struct ieee80211com *ic = vap->iv_ic;
 	enum ieee80211_state ostate;
 	int status;
 
-	IEEE80211_LOCK_ASSERT(ic);
+	IEEE80211_LOCK_ASSERT(vap->iv_ic);
 
 	ostate = vap->iv_state;
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
@@ -211,11 +201,6 @@ tdma_newstate(struct ieee80211vap *vap, 
 		 */
 		vap->iv_state = nstate;			/* state transition */
 		ieee80211_cancel_scan(vap);		/* background scan */
-		if (ostate == IEEE80211_S_RUN) {
-			/* purge station table; entries are stale */
-			ieee80211_iterate_nodes(&ic->ic_sta, sta_leave, vap);
-			ieee80211_free_node(vap->iv_bss);	/* XXX */
-		}
 		if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) {
 			ieee80211_check_scan(vap,
 			    vap->iv_scanreq_flags,
@@ -341,6 +326,7 @@ tdma_recv_mgmt(struct ieee80211_node *ni
 			 * Count beacon frame for s/w bmiss handling.
 			 */
 			vap->iv_swbmiss_count++;
+			vap->iv_bmiss_count = 0;
 			/*
 			 * Process tdma ie.  The contents are used to sync
 			 * the slot timing, reconfigure the bss, etc.