From owner-p4-projects@FreeBSD.ORG  Thu Aug  4 03:45:33 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0599216A421; Thu,  4 Aug 2005 03:45:33 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 D403516A41F
	for <perforce@freebsd.org>; Thu,  4 Aug 2005 03:45:32 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A547B43D45
	for <perforce@freebsd.org>; Thu,  4 Aug 2005 03:45:32 +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 j743jWA2043372
	for <perforce@freebsd.org>; Thu, 4 Aug 2005 03:45:32 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j743jWen043369
	for perforce@freebsd.org; Thu, 4 Aug 2005 03:45:32 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 4 Aug 2005 03:45:32 GMT
Message-Id: <200508040345.j743jWen043369@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 81423 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: Thu, 04 Aug 2005 03:45:33 -0000

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

Change 81423 by sam@sam_ebb on 2005/08/04 03:44:43

	o clear m_nextpkt when building a ff so ath_start doesn't think
	  the frame has been fragmented
	o plug mbuf leak on ff build failure

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#52 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#52 (text+ko) ====

@@ -557,6 +557,7 @@
 				"%s: only one frame\n", __func__);
 			goto bad;
 		}
+		m->m_nextpkt = NULL;
 		/*
 		 * Include fast frame headers in adjusting header
 		 * layout; this allocates space according to what
@@ -568,6 +569,7 @@
 			key, m);
 		if (m == NULL) {
 			/* NB: ieee80211_mbuf_adjust handles msgs+statistics */
+			m_freem(m2);
 			goto bad;
 		}
 		/*