ath(4) problems after sam_wifi merge

Hi,
I'm having some problems with ath after the sam_wifi branch merge.
Basically I have all the necessary modules loaded, but scanning is not
working well.

% kldstat | egrep wlan\|ath
 2    1 0xc097a000 12450    if_ath.ko
 3    3 0xc098d000 2ec38    ath_hal.ko
 4    8 0xc09bc000 2b65c    wlan.ko
 5    2 0xc09e8000 43e8     ath_rate.ko
20    1 0xc0af7000 4480     wlan_tkip.ko
21    1 0xc0afc000 2fec     wlan_wep.ko
22    1 0xc0aff000 7100     wlan_ccmp.ko
23    1 0xc0b07000 1920     wlan_scan_ap.ko
24    1 0xc0b09000 552c     wlan_scan_sta.ko

Is anything missing?

My card is:
ath0: <Atheros 5424/2424> mem 0x90100000-0x9010ffff irq 17 at device 0.0 on pci2
ath0: [ITHREAD]
ath0: using obsoleted if_watchdog interface
ath0: mac 10.3 phy 6.1 radio 10.2

ath0: flags=8802<BROADCAST,SIMPLEX,MULTICAST> metric 0 mtu 1500
        ether 00:17:f2:44:ba:50
        media: IEEE 802.11 Wireless Ethernet autoselect (autoselect)
        status: no carrier
        ssid "" channel 1 (2412 Mhz 11g)
        authmode OPEN privacy OFF txpowmax 34 bmiss 7 scanvalid 60 bgscan
        bgscanintvl 300 bgscanidle 250 roam:rssi11g 14 roam:rate11g 5
        protmode CTS burst bintval 100

# ./wlandebug 
net.wlan.0.debug: 0xffffff<assoc,auth,scan,output,state,power,dot1x,dot1xsm,radius,raddump,radkeys,wpa,acl,wme,superg,doth,inact,roam,rate>

After ifconfig ath0 up, the scan goes as:

ath0: ieee80211_newstate: INIT -> SCAN
ath0: ieee80211_check_scan: active scan, duration 2147483647, desired mode auto, flush
ath0: sta_pick_bss: no scan candidate
ath0: ieee80211_start_scan: active scan, duration 2147483647, desired mode auto, flush
ath0: scan set 1g dwell min 200 max 2000
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 83517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 85517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 87517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 89517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 91517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 93517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 95517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: sta_pick_bss: no scan candidate
ath0: scan_next: done, restart [ticks 97517, dwell min 200 scanend 2147565163]
ath0: scan_next: chan   1g ->   1g [active, dwell min 200 max 2000]
ath0: ieee80211_start_scan: active scan already in progress


For some reason it takes a long time to stop scanning on a channel and
when it stops, it doesn't advance to the next channel.

Any idea about what might be going on ?

Thanks.
--
Rui Paulo