svn commit: r225126 - user/adrian/if_ath_tx/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Wed Aug 24 03:09:02 2011
New Revision: 225126
URL: http://svn.freebsd.org/changeset/base/225126

Log:
  Tidy this up a bit

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	Wed Aug 24 00:45:53 2011	(r225125)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Wed Aug 24 03:09:02 2011	(r225126)
@@ -1879,15 +1879,19 @@ _ath_getbuf_locked(struct ath_softc *sc)
 		TAILQ_REMOVE(&sc->sc_txbuf, bf, bf_list);
 	else
 		bf = NULL;
+
 	if (bf == NULL) {
 		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_last = NULL;	/* XXX again, just to be sure */
-		bf->bf_comp = NULL;	/* XXX again, just to be sure */
+		return NULL;
 	}
+
+	/* Valid bf here; clear some basic fields */
+	bf->bf_next = NULL;	/* XXX just to be sure */
+	bf->bf_last = NULL;	/* XXX again, just to be sure */
+	bf->bf_comp = NULL;	/* XXX again, just to be sure */
+
 	return bf;
 }