[Madwifi-cvs] madwifi/ath if_ath.c,1.16,1.17

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

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

Modified Files:
	if_ath.c 
Log Message:
use a local variable


Index: if_ath.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/ath/if_ath.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** if_ath.c	22 Sep 2004 20:12:48 -0000	1.16
--- if_ath.c	22 Sep 2004 20:15:09 -0000	1.17
***************
*** 4298,4301 ****
--- 4298,4302 ----
  {
  	struct ath_softc *sc = ctl->extra1;
+ 	struct ath_hal *ah = sc->sc_ah;
  	u_int val;
  	int ret;
***************
*** 4308,4320 ****
  			switch (ctl->ctl_name) {
  			case ATH_SLOTTIME:
! 				if (!ath_hal_setslottime(sc->sc_ah, val))
  					ret = -EINVAL;
  				break;
  			case ATH_ACKTIMEOUT:
! 				if (!ath_hal_setacktimeout(sc->sc_ah, val))
  					ret = -EINVAL;
  				break;
  			case ATH_CTSTIMEOUT:
! 				if (!ath_hal_setctstimeout(sc->sc_ah, val))
  					ret = -EINVAL;
  				break;
--- 4309,4321 ----
  			switch (ctl->ctl_name) {
  			case ATH_SLOTTIME:
! 				if (!ath_hal_setslottime(ah, val))
  					ret = -EINVAL;
  				break;
  			case ATH_ACKTIMEOUT:
! 				if (!ath_hal_setacktimeout(ah, val))
  					ret = -EINVAL;
  				break;
  			case ATH_CTSTIMEOUT:
! 				if (!ath_hal_setctstimeout(ah, val))
  					ret = -EINVAL;
  				break;
***************
*** 4322,4329 ****
  				if (val != sc->sc_softled) {
  					if (val)
! 						ath_hal_gpioCfgOutput(sc->sc_ah,
  							sc->sc_ledpin);
! 					ath_hal_gpioset(sc->sc_ah,
! 						sc->sc_ledpin,!val);
  					sc->sc_softled = val;
  				}
--- 4323,4329 ----
  				if (val != sc->sc_softled) {
  					if (val)
! 						ath_hal_gpioCfgOutput(ah,
  							sc->sc_ledpin);
! 					ath_hal_gpioset(ah, sc->sc_ledpin,!val);
  					sc->sc_softled = val;
  				}
***************
*** 4346,4356 ****
  		switch (ctl->ctl_name) {
  		case ATH_SLOTTIME:
! 			val = ath_hal_getslottime(sc->sc_ah);
  			break;
  		case ATH_ACKTIMEOUT:
! 			val = ath_hal_getacktimeout(sc->sc_ah);
  			break;
  		case ATH_CTSTIMEOUT:
! 			val = ath_hal_getctstimeout(sc->sc_ah);
  			break;
  		case ATH_SOFTLED:
--- 4346,4356 ----
  		switch (ctl->ctl_name) {
  		case ATH_SLOTTIME:
! 			val = ath_hal_getslottime(ah);
  			break;
  		case ATH_ACKTIMEOUT:
! 			val = ath_hal_getacktimeout(ah);
  			break;
  		case ATH_CTSTIMEOUT:
! 			val = ath_hal_getctstimeout(ah);
  			break;
  		case ATH_SOFTLED:
***************
*** 4361,4368 ****
  			break;
  		case ATH_COUNTRYCODE:
! 			ath_hal_getcountrycode(sc->sc_ah, &val);
  			break;
  		case ATH_REGDOMAIN:
! 			ath_hal_getregdomain(sc->sc_ah, &val);
  			break;
  		case ATH_DEBUG:
--- 4361,4368 ----
  			break;
  		case ATH_COUNTRYCODE:
! 			ath_hal_getcountrycode(ah, &val);
  			break;
  		case ATH_REGDOMAIN:
! 			ath_hal_getregdomain(ah, &val);
  			break;
  		case ATH_DEBUG: