svn commit: r184351 - head/sys/dev/ath
Sam Leffler
sam at FreeBSD.org
Mon Oct 27 10:16:46 PDT 2008
Author: sam
Date: Mon Oct 27 17:16:46 2008
New Revision: 184351
URL: http://svn.freebsd.org/changeset/base/184351
Log:
rename bf_flags to bf_txflags in preparation for the addition of flags
separate from the tx descriptor flags currently recorded
Modified:
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_athvar.h
Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c Mon Oct 27 17:14:39 2008 (r184350)
+++ head/sys/dev/ath/if_ath.c Mon Oct 27 17:16:46 2008 (r184351)
@@ -4958,7 +4958,7 @@ ath_tx_start(struct ath_softc *sc, struc
, ctsrate /* rts/cts rate */
, ctsduration /* rts/cts duration */
);
- bf->bf_flags = flags;
+ bf->bf_txflags = flags;
/*
* Setup the multi-rate retry state only when we're
* going to use it. This assumes ath_hal_setuptxdesc
@@ -5054,7 +5054,7 @@ ath_tx_processq(struct ath_softc *sc, st
* Hand the descriptor to the rate control algorithm.
*/
if ((ts->ts_status & HAL_TXERR_FILT) == 0 &&
- (bf->bf_flags & HAL_TXDESC_NOACK) == 0) {
+ (bf->bf_txflags & HAL_TXDESC_NOACK) == 0) {
/*
* If frame was ack'd update the last rx time
* used to workaround phantom bmiss interrupts.
@@ -6220,7 +6220,7 @@ ath_printtxbuf(const struct ath_buf *bf,
printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:04%x%s\n"
" %08x %08x %08x %08x %08x %08x\n",
ds, (const struct ath_desc *)bf->bf_daddr + i,
- ds->ds_link, ds->ds_data, bf->bf_flags,
+ ds->ds_link, ds->ds_data, bf->bf_txflags,
!done ? "" : (ts->ts_status == 0) ? " *" : " !",
ds->ds_ctl0, ds->ds_ctl1,
ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3]);
@@ -6863,7 +6863,7 @@ ath_tx_raw_start(struct ath_softc *sc, s
, ctsrate /* rts/cts rate */
, ctsduration /* rts/cts duration */
);
- bf->bf_flags = flags;
+ bf->bf_txflags = flags;
if (ismrr) {
rix = ath_tx_findrix(rt, params->ibp_rate1);
Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h Mon Oct 27 17:14:39 2008 (r184350)
+++ head/sys/dev/ath/if_athvar.h Mon Oct 27 17:16:46 2008 (r184351)
@@ -106,7 +106,7 @@ struct ath_buf {
TAILQ_ENTRY(ath_buf) bf_stagelist; /* stage queue list */
u_int32_t bf_age; /* age when placed on stageq */
int bf_nseg;
- int bf_flags; /* tx descriptor flags */
+ int bf_txflags; /* tx descriptor flags */
struct ath_desc *bf_desc; /* virtual addr of desc */
struct ath_desc_status bf_status; /* tx/rx status */
bus_addr_t bf_daddr; /* physical addr of desc */
More information about the svn-src-all
mailing list