From owner-p4-projects@FreeBSD.ORG  Wed Jan 12 22:00:10 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C45116A4D0; Wed, 12 Jan 2005 22:00:10 +0000 (GMT)
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 F3A0B16A4CE
	for <perforce@freebsd.org>; Wed, 12 Jan 2005 22:00:09 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DDF1C43D2F
	for <perforce@freebsd.org>; Wed, 12 Jan 2005 22:00:09 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0CM09iB012256
	for <perforce@freebsd.org>; Wed, 12 Jan 2005 22:00:09 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0CM09C9012253
	for perforce@freebsd.org; Wed, 12 Jan 2005 22:00:09 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 12 Jan 2005 22:00:09 GMT
Message-Id: <200501122200.j0CM09C9012253@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 68856 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: Wed, 12 Jan 2005 22:00:10 -0000

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

Change 68856 by sam@sam_ebb on 2005/01/12 21:59:40

	o hold a node reference in each beacon tx buf for consistency
	o reclaim existing beacon resources explicitly before allocating
	  new ones (eliminates code duplication)

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#68 edit

Differences ...

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

@@ -2069,12 +2069,6 @@
 		sc->sc_stats.ast_be_nombuf++;	/* XXX */
 		return ENOMEM;			/* XXX */
 	}
-	if (bf->bf_m != NULL) {
-		bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap);
-		m_freem(bf->bf_m);
-		bf->bf_m = NULL;
-		bf->bf_node = NULL;
-	}
 	/*
 	 * NB: the beacon data buffer must be 32-bit aligned;
 	 * we assume the mbuf routines will return us something
@@ -2092,7 +2086,7 @@
 				     BUS_DMA_NOWAIT);
 	if (error == 0) {
 		bf->bf_m = m;
-		bf->bf_node = ni;		/* NB: no held reference */
+		bf->bf_node = ieee80211_ref_node(ni);
 	} else {
 		m_freem(m);
 	}
@@ -2322,13 +2316,17 @@
 {
 	struct ath_buf *bf;
 
-	STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list)
+	STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) {
 		if (bf->bf_m != NULL) {
 			bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap);
 			m_freem(bf->bf_m);
 			bf->bf_m = NULL;
+		}
+		if (bf->bf_node != NULL) {
+			ieee80211_free_node(bf->bf_node);
 			bf->bf_node = NULL;
 		}
+	}
 }
 
 /*
@@ -4355,6 +4353,7 @@
 			 * be called with beacon transmission active.
 			 */
 			ath_hal_stoptxdma(ah, sc->sc_bhalq);
+			ath_beacon_free(sc);
 			error = ath_beacon_alloc(sc, ni);
 			if (error != 0)
 				goto bad;