From owner-p4-projects@FreeBSD.ORG  Sat Dec 13 12:53:04 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D599116A4D0; Sat, 13 Dec 2003 12:53:03 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AB08A16A4CE
	for <perforce@freebsd.org>; Sat, 13 Dec 2003 12:53:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E378543D55
	for <perforce@freebsd.org>; Sat, 13 Dec 2003 12:53:02 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDKr2XJ069674
	for <perforce@freebsd.org>; Sat, 13 Dec 2003 12:53:02 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDKr2xR069671
	for perforce@freebsd.org; Sat, 13 Dec 2003 12:53:02 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sat, 13 Dec 2003 12:53:02 -0800 (PST)
Message-Id: <200312132053.hBDKr2xR069671@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>
Subject: PERFORCE change 43910 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 13 Dec 2003 20:53:04 -0000

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

Change 43910 by sam@sam_ebb on 2003/12/13 12:52:37

	reclaim node references held in packets when draining the tx queue

Affected files ...

.. //depot/projects/netperf/sys/dev/ath/if_ath.c#49 edit

Differences ...

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

@@ -2246,7 +2246,9 @@
 ath_draintxq(struct ath_softc *sc)
 {
 	struct ath_hal *ah = sc->sc_ah;
-	struct ifnet *ifp = &sc->sc_ic.ic_if;
+	struct ieee80211com *ic = &sc->sc_ic;
+	struct ifnet *ifp = &ic->ic_if;
+	struct ieee80211_node *ni;
 	struct ath_buf *bf;
 
 	/* XXX return value */
@@ -2278,7 +2280,14 @@
 		bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap);
 		m_freem(bf->bf_m);
 		bf->bf_m = NULL;
+		ni = bf->bf_node;
 		bf->bf_node = NULL;
+		if (ni != NULL && ni != ic->ic_bss) {
+			/*
+			 * Reclaim node reference.
+			 */
+			ieee80211_free_node(ic, ni);
+		}
 		ATH_TXBUF_LOCK(sc);
 		TAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list);
 		ATH_TXBUF_UNLOCK(sc);