From owner-p4-projects@FreeBSD.ORG  Mon Mar 31 17:41:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB4E8106566B; Mon, 31 Mar 2008 17:41:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B7021065670
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 17:41:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C8FE8FC27
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 17:41:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VHfnYD052563
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 17:41:49 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VHfnJd052561
	for perforce@freebsd.org; Mon, 31 Mar 2008 17:41:49 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 31 Mar 2008 17:41:49 GMT
Message-Id: <200803311741.m2VHfnJd052561@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139089 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Mar 2008 17:41:50 -0000

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

Change 139089 by sam@sam_ebb on 2008/03/31 17:40:52

	go back to just deq'ing the packet and not polling first before
	acquiring the tx buffer; will need to revisit altq later

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#53 edit

Differences ...

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

@@ -1863,9 +1863,6 @@
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || sc->sc_invalid)
 		return;
 	for (;;) {
-		IFQ_POLL(&ifp->if_snd, m);
-		if (m == NULL)
-			break;
 		/*
 		 * Grab a TX buffer and associated resources.
 		 */
@@ -1877,22 +1874,19 @@
 		if (bf == NULL) {
 			DPRINTF(sc, ATH_DEBUG_XMIT, "%s: out of xmit buffers\n",
 				__func__);
-			/* XXX tail drop */
 			sc->sc_stats.ast_tx_qstop++;
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			break;
 		}
 
-		STAILQ_INIT(&frags);
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (m == NULL) {
-			/*
-			 * The q was emptied while we blocked,
-			 * this can happen when we're preempted.
-			 */
-			ni = NULL;
-			goto reclaim;
+			ATH_TXBUF_LOCK(sc);
+			STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list);
+			ATH_TXBUF_UNLOCK(sc);
+			break;
 		}
+		STAILQ_INIT(&frags);
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		pri = M_WME_GETAC(m);
 		txq = sc->sc_ac2q[pri];