d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC 1.139: unbreak cabq handling

Browse Source 
Approved by:	re (scottl)
This commit is contained in:
sam 2006-04-19 16:14:47 +00:00
parent e83605b8fb
commit 50c1441ff6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ath/if_ath.c
View File

@ -2037,7 +2037,7 @@ ath_beacon_proc(void *arg, int pending)
* of the TIM bitmap).
*/
m = bf->bf_m;
ncabq = ath_hal_numtxpending(ah, sc->sc_cabq->axq_qnum);
ncabq = sc->sc_cabq->axq_depth;
if (ieee80211_beacon_update(ic, bf->bf_node, &sc->sc_boff, m, ncabq)) {
/* XXX too conservative? */
bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap);
@ -2097,7 +2097,7 @@ ath_beacon_proc(void *arg, int pending)
* Enable the CAB queue before the beacon queue to
* insure cab frames are triggered by this beacon.
*/
if (ncabq != 0 && (sc->sc_boff.bo_tim[4] & 1)) /* NB: only at DTIM */
if (sc->sc_boff.bo_tim[4] & 1) /* NB: only at DTIM */
ath_hal_txstart(ah, sc->sc_cabq->axq_qnum);
ath_hal_puttxbuf(ah, sc->sc_bhalq, bf->bf_daddr);
ath_hal_txstart(ah, sc->sc_bhalq);