[Madwifi-cvs] madwifi/ath if_ath.c,1.21,1.22

[Sam L. <sam...@us...>]

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

Modified Files:
	if_ath.c 
Log Message:
o allocate tx queue for BK first so it gets lowest priority
o correct error handling for various unlikely cases (was not setting
  the return code)

Obtained from:	FreeBSD


Index: if_ath.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/ath/if_ath.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** if_ath.c	28 Sep 2004 04:49:54 -0000	1.21
--- if_ath.c	6 Oct 2004 16:55:57 -0000	1.22
***************
*** 380,393 ****
  		printk(KERN_ERR "%s: unable to setup a beacon xmit queue!\n",
  			dev->name);
  		goto bad2;
  	}
! 	if (!ath_tx_setup(sc, WME_AC_BE, HAL_WME_AC_BE))
! 		goto bad2;
! 	if (!ath_tx_setup(sc, WME_AC_BK, HAL_WME_AC_BK))
! 		goto bad2;
! 	if (!ath_tx_setup(sc, WME_AC_VI, HAL_WME_AC_VI))
! 		goto bad2;
! 	if (!ath_tx_setup(sc, WME_AC_VO, HAL_WME_AC_VO))
  		goto bad2;
  	/* 
  	 * Special case certain configurations.
--- 380,394 ----
  		printk(KERN_ERR "%s: unable to setup a beacon xmit queue!\n",
  			dev->name);
+ 		error = EIO;
  		goto bad2;
  	}
! 	/* NB: insure BK queue is h/w queue 0 */
! 	if (!ath_tx_setup(sc, WME_AC_BE, HAL_WME_AC_BK) ||
! 	    !ath_tx_setup(sc, WME_AC_BK, HAL_WME_AC_BE) ||
! 	    !ath_tx_setup(sc, WME_AC_VI, HAL_WME_AC_VI) ||
! 	    !ath_tx_setup(sc, WME_AC_VO, HAL_WME_AC_VO)) {
! 		error = EIO;
  		goto bad2;
+ 	}
  	/* 
  	 * Special case certain configurations.
***************
*** 403,408 ****
  
  	sc->sc_rc = ath_rate_attach(sc);
! 	if (sc->sc_rc == NULL)
  		goto bad2;
  
  	init_timer(&sc->sc_scan_ch);
--- 404,411 ----
  
  	sc->sc_rc = ath_rate_attach(sc);
! 	if (sc->sc_rc == NULL) {
! 		error = EIO;
  		goto bad2;
+ 	}
  
  	init_timer(&sc->sc_scan_ch);