From owner-svn-src-user@FreeBSD.ORG  Mon Aug 22 16:35:47 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F979106567A;
	Mon, 22 Aug 2011 16:35:47 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20AF98FC12;
	Mon, 22 Aug 2011 16:35:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7MGZlVX058798;
	Mon, 22 Aug 2011 16:35:47 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7MGZk2m058796;
	Mon, 22 Aug 2011 16:35:46 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201108221635.p7MGZk2m058796@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 22 Aug 2011 16:35:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225078 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2011 16:35:47 -0000

Author: adrian
Date: Mon Aug 22 16:35:46 2011
New Revision: 225078
URL: http://svn.freebsd.org/changeset/base/225078

Log:
  Fix a NULL de-reference

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Mon Aug 22 11:22:13 2011	(r225077)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Mon Aug 22 16:35:46 2011	(r225078)
@@ -1883,9 +1883,10 @@ _ath_getbuf_locked(struct ath_softc *sc)
 		DPRINTF(sc, ATH_DEBUG_XMIT, "%s: %s\n", __func__,
 		    TAILQ_FIRST(&sc->sc_txbuf) == NULL ?
 			"out of xmit buffers" : "xmit buffer busy");
+	} else {
+		bf->bf_next = NULL;	/* XXX just to be sure */
+		bf->bf_comp = NULL;	/* XXX again, just to be sure */
 	}
-	bf->bf_next = NULL;	/* XXX just to be sure */
-	bf->bf_comp = NULL;	/* XXX again, just to be sure */
 	return bf;
 }