ath changes: please test

[Rainer Alves]

Sam Leffler wrote:
> There's a new hal and patch for the ath driver available for test:
> 
> http://people.freebsd.org/~sam/ath_hal-20051212.tgz
> http://people.freebsd.org/~sam/ath.patch
> 
> The patch is against current.  I just committed a bunch of net80211 
> changes that are required so be sure your system is up to date before 
> applying the ath patch.
> [...]


Received the following error while trying to rebuild the kernel with 
your new ath hal/driver:

===> ath_rate_amrr (all)
cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE 
-nostdinc -I-  -I. 
-I/usr/src/sys/modules/ath_rate_amrr/../../contrib/dev/ath/freebsd 
-I/usr/src/sys/modules/ath_rate_amrr/../../contrib/dev/ath 
-DHAVE_KERNEL_OPTION_HEADERS -include 
/usr/obj/usr/src/sys/RAINER/opt_global.h -I. -I@ -I@/contrib/altq 
-finline-limit=8000 -fno-common  -I/usr/obj/usr/src/sys/RAINER 
-mno-align-long-strings -mpreferred-stack-boundary=2  -mno-mmx 
-mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes 
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual 
-fformat-extensions -std=c99 -c 
/usr/src/sys/modules/ath_rate_amrr/../../dev/ath/ath_rate/amrr/amrr.c
/usr/src/sys/modules/ath_rate_amrr/../../dev/ath/ath_rate/amrr/amrr.c: 
In function `ath_rate_update':
/usr/src/sys/modules/ath_rate_amrr/../../dev/ath/ath_rate/amrr/amrr.c:253: 
error: structure has no member named `an_tx_rate3'
*** Error code 1


I had to patch if_athvar.h, which fixed things for me:

--- if_athvar.h.old     Tue Dec 13 00:40:52 2005
+++ if_athvar.h Tue Dec 13 00:41:38 2005
@@ -78,6 +78,7 @@
  /* driver-specific node state */
  struct ath_node {
         struct ieee80211_node an_node;  /* base class */
+       u_int8_t        an_tx_rate3;
         u_int32_t       an_avgrssi;     /* average rssi over all rx 
frames */
         /* variable-length rate control state follows */
  };


Hopefully that's the right fix. The new hal/driver seem to be working 
fine so far... thanks for your work on this.

ath_hal: 0.9.16.13 (AR5210, AR5211, AR5212, RF5111, RF5112, RF2413, 
RF5413, DFS)
ath0: <Atheros 5211> mem 0xc0210000-0xc021ffff irq 11 at device 0.0 on 
cardbus0
ath0: Ethernet address: 00:05:5d:88:d7:77
ath0: mac 4.2 phy 3.0 5ghz radio 1.7 2ghz radio 2.3
ath0: link state changed to UP

--
Rainer Alves