[Madwifi-cvs] madwifi/ath if_ath.c,1.36.2.66,1.36.2.67

[Bruno R. <br...@us...>]

Update of /cvsroot/madwifi/madwifi/ath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4630/ath

Modified Files:
      Tag: BSD
	if_ath.c 
Log Message:
- always honor fixed rate settings, without bothering the rate modules


Index: if_ath.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/ath/if_ath.c,v
retrieving revision 1.36.2.66
retrieving revision 1.36.2.67
diff -C2 -d -r1.36.2.66 -r1.36.2.67
*** if_ath.c	30 May 2005 19:51:53 -0000	1.36.2.66
--- if_ath.c	31 May 2005 10:59:25 -0000	1.36.2.67
***************
*** 4109,4117 ****
  			flags |= HAL_TXDESC_INTREQ;	/* force interrupt */
  		} else {
! 			/*
! 			 * Data frames; consult the rate control module.
! 			 */
! 			ath_rate_findrate(sc, an, shortPreamble, pktlen,
  					  &rix, &try0, &txrate);
  		}
  		sc->sc_txrate = txrate;			/* for LED blinking */
--- 4109,4127 ----
  			flags |= HAL_TXDESC_INTREQ;	/* force interrupt */
  		} else {
! 			if (ic->ic_fixed_rate == -1) {
! 				/*
! 				 * Data frames; consult the rate control module.
! 				 */
! 				ath_rate_findrate(sc, an, shortPreamble, pktlen,
  					  &rix, &try0, &txrate);
+ 			} 
+ 			else {
+ 				rix = ic->ic_fixed_rate;
+ 				try0 = ATH_TXMAXTRY; //XXX: should be configurabe
+ 				if (shortPreamble)
+ 					txrate = rt->info[rix].shortPreamble;
+ 				else
+ 					txrate = rt->info[rix].rateCode;
+ 			}
  		}
  		sc->sc_txrate = txrate;			/* for LED blinking */