PERFORCE change 115374 for review

[Sam Leffler]

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

Change 115374 by sam at sam_ebb on 2007/03/05 22:10:17

	IFC

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#136 integrate
.. //depot/projects/wifi/sys/dev/ath/if_athvar.h#55 integrate

Differences ...

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

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.162 2007/02/24 23:23:29 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.164 2007/03/05 21:56:33 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -419,7 +419,8 @@
 		error = EIO;
 		goto bad2;
 	}
-	ath_txq_init(sc, &sc->sc_mcastq, -1);	/* NB: s/w q, qnum not used */
+	/* NB: s/w q, qnum used only by WITNESS */
+	ath_txq_init(sc, &sc->sc_mcastq, HAL_NUM_TX_QUEUES+1);
 	/* NB: insure BK queue is the lowest priority h/w queue */
 	if (!ath_tx_setup(sc, WME_AC_BK, HAL_WME_AC_BK)) {
 		if_printf(ifp, "unable to setup xmit queue for %s traffic!\n",
@@ -3730,6 +3731,11 @@
 	if (ngood)
 		sc->sc_lastrx = tsf;
 
+	/* NB: may want to check mgtq too */
+	if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0 &&
+	    !IFQ_IS_EMPTY(&ifp->if_snd))
+		ath_start(ifp);
+
 	NET_UNLOCK_GIANT();		/* XXX */
 #undef PA2DESC
 }

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

@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.59 2007/02/24 23:12:58 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.60 2007/03/05 21:56:33 sam Exp $
  */
 
 /*
@@ -166,7 +166,7 @@
 #define	ATH_TXQ_LOCK_INIT(_sc, _tq) do { \
 	snprintf((_tq)->axq_name, sizeof((_tq)->axq_name), "%s_txq%u", \
 		device_get_nameunit((_sc)->sc_dev), (_tq)->axq_qnum); \
-	mtx_init(&(_tq)->axq_lock, (_tq)->axq_name, "ath_txq", MTX_DEF); \
+	mtx_init(&(_tq)->axq_lock, (_tq)->axq_name, NULL, MTX_DEF); \
 } while (0)
 #define	ATH_TXQ_LOCK_DESTROY(_tq)	mtx_destroy(&(_tq)->axq_lock)
 #define	ATH_TXQ_LOCK(_tq)		mtx_lock(&(_tq)->axq_lock)
@@ -329,7 +329,7 @@
 
 #define	ATH_LOCK_INIT(_sc) \
 	mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
-		 MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE)
+		 NULL, MTX_DEF | MTX_RECURSE)
 #define	ATH_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_mtx)
 #define	ATH_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
 #define	ATH_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
@@ -340,7 +340,7 @@
 #define	ATH_TXBUF_LOCK_INIT(_sc) do { \
 	snprintf((_sc)->sc_txname, sizeof((_sc)->sc_txname), "%s_buf", \
 		device_get_nameunit((_sc)->sc_dev)); \
-	mtx_init(&(_sc)->sc_txbuflock, (_sc)->sc_txname, "ath_buf", MTX_DEF); \
+	mtx_init(&(_sc)->sc_txbuflock, (_sc)->sc_txname, NULL, MTX_DEF); \
 } while (0)
 #define	ATH_TXBUF_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_txbuflock)
 #define	ATH_TXBUF_LOCK(_sc)		mtx_lock(&(_sc)->sc_txbuflock)