[Madwifi-cvs] madwifi/ath_rate/sample sample.c,1.1.2.15,1.1.2.16 sample.h,1.1.2.11,1.1.2.12

[John B. <jb...@us...>]

Update of /cvsroot/madwifi/madwifi/ath_rate/sample
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28528

Modified Files:
      Tag: BSD
	sample.c sample.h 
Log Message:
Make rate_ctl_reset more like Sam's version. From Tai-hwa Liang.




Index: sample.h
===================================================================
RCS file: /cvsroot/madwifi/madwifi/ath_rate/sample/sample.h,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** sample.h	19 Apr 2005 14:57:32 -0000	1.1.2.11
--- sample.h	3 Jun 2005 19:28:32 -0000	1.1.2.12
***************
*** 206,213 ****
  	KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  
! 	KASSERT(rt->info[rix].rateKbps, ("rix %d (%d) bad ratekbps %d mode %u",
! 					 rix, rt->info[rix].dot11Rate,
! 					 rt->info[rix].rateKbps,
! 					 sc->sc_curmode));
  	/* 
  	 * XXX getting mac/phy level timings should be fixed for turbo
--- 206,217 ----
  	KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  
! 	if (!rt->info[rix].rateKbps) {
! 		printk(KERN_WARNING "rix %d (%d) bad ratekbps %d mode %u",
! 		       rix, rt->info[rix].dot11Rate,
! 		       rt->info[rix].rateKbps,
! 		       sc->sc_curmode);
! 
! 		return 0;
! 	}
  	/* 
  	 * XXX getting mac/phy level timings should be fixed for turbo
***************
*** 255,262 ****
  		int ctsduration = 0;
  
! 		KASSERT(rt->info[cix].rateKbps, ("cix %d (%d) bad ratekbps %d mode %u",
! 						 cix, rt->info[cix].dot11Rate,
! 						 rt->info[cix].rateKbps,
! 						 sc->sc_curmode));
  		
  
--- 259,269 ----
  		int ctsduration = 0;
  
! 		if (!rt->info[cix].rateKbps) {
! 			printk(KERN_WARNING "cix %d (%d) bad ratekbps %d mode %u",
! 			       cix, rt->info[cix].dot11Rate,
! 			       rt->info[cix].rateKbps,
! 			       sc->sc_curmode);
! 			return 0;
! 		}
  		
  

Index: sample.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/ath_rate/sample/sample.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** sample.c	31 May 2005 14:19:51 -0000	1.1.2.15
--- sample.c	3 Jun 2005 19:28:32 -0000	1.1.2.16
***************
*** 779,800 ****
  {
  	struct ieee80211com *ic = &sc->sc_ic;
! 	struct ieee80211_node *ni;
! 
! 	if (ic->ic_opmode == IEEE80211_M_STA) {
! 		/*
! 		 * Reset local xmit state; this is really only
! 		 * meaningful when operating in station mode.
! 		 */
! 		ni = ic->ic_bss;
! 		ath_rate_ctl_reset(sc, ni);
!         } else {
! 		/*
! 		 * When operating as a station the node table holds
! 		 * the AP's that were discovered during scanning.
! 		 * For any other operating mode we want to reset the
! 		 * tx rate state of each node.
! 		 */
!                 ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc);
! 		ath_rate_ctl_reset(sc, ic->ic_bss);
  	}
  }
--- 779,791 ----
  {
  	struct ieee80211com *ic = &sc->sc_ic;
! 	
! 	if (newstate == IEEE80211_S_RUN) {
! 		if (ic->ic_opmode != IEEE80211_M_STA) {
! 			/*
! 			 * Sync rates for associated stations and neighbors.
! 			 */
! 			ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc);
! 		}
! 		ath_rate_newassoc(sc, ATH_NODE(ic->ic_bss), 1);
  	}
  }