PERFORCE change 151533 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=151533

Change 151533 by sam at sam_ebb on 2008/10/18 23:31:29

	rename bf_flags as bf_txflags, it's a copy of the flags from
	the tx descriptor; shortly we'll be splitting this to add s/w
	flags distinct from the h/w descriptor

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#105 edit
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#34 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#105 (text+ko) ====

@@ -4977,7 +4977,7 @@
 		, 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
@@ -5051,7 +5051,7 @@
 				pri = M_WME_GETAC(bf->bf_m);
 				if (pri >= WME_AC_VO)
 					ic->ic_wme.wme_hipri_traffic++;
-				if ((bf->bf_flags & HAL_TXDESC_NOACK) == 0)
+				if ((bf->bf_txflags & HAL_TXDESC_NOACK) == 0)
 					ni->ni_inact = ni->ni_inact_reload;
 			} else {
 				if (ts->ts_status & HAL_TXERR_XRETRY)
@@ -5071,7 +5071,7 @@
 			 * 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 statistics,
 				 * including the last rx time used to
@@ -5091,7 +5091,7 @@
 			 */
 			if (bf->bf_m->m_flags & M_TXCB)
 				ieee80211_process_callback(ni, bf->bf_m,
-				    (bf->bf_flags & HAL_TXDESC_NOACK) == 0 ?
+				    (bf->bf_txflags & HAL_TXDESC_NOACK) == 0 ?
 				        ts->ts_status : HAL_TXERR_XRETRY);
 			/*
 			 * Reclaim reference to node.
@@ -6229,7 +6229,7 @@
 		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]);
@@ -6919,7 +6919,7 @@
 		, 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);

==== //depot/projects/vap/sys/dev/ath/if_athvar.h#34 (text+ko) ====

@@ -109,7 +109,7 @@
 	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 */