From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 19 17:06:22 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1A76C86A;
 Mon, 19 Nov 2012 17:06:22 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F1EA78FC16;
 Mon, 19 Nov 2012 17:06:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJH6L5U005363;
 Mon, 19 Nov 2012 17:06:21 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJH6Lr9005362;
 Mon, 19 Nov 2012 17:06:21 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201211191706.qAJH6Lr9005362@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 19 Nov 2012 17:06:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243289 - stable/9/sys/net
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Nov 2012 17:06:22 -0000

Author: emaste
Date: Mon Nov 19 17:06:21 2012
New Revision: 243289
URL: http://svnweb.freebsd.org/changeset/base/243289

Log:
  MFC r238298: Restore error handling lost in r191603
  
    This was missed in the change from IFQ_ENQUEUE to if_transmit.
  
  MFC r238346: Plug potential mbuf leak when bridging fragments
  
    If an error occurs when transmitting one mbuf in a chain of fragments,
    free the subsequent fragments instead of leaking them.
  
  MFC r238355: Simplify error case
  
    Submitted by:        thompsa@
  
  Sponsored by: ADARA Networks

Modified:
  stable/9/sys/net/if_bridge.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/net/if_bridge.c
==============================================================================
--- stable/9/sys/net/if_bridge.c	Mon Nov 19 16:52:58 2012	(r243288)
+++ stable/9/sys/net/if_bridge.c	Mon Nov 19 17:06:21 2012	(r243289)
@@ -1811,8 +1811,10 @@ bridge_enqueue(struct bridge_softc *sc, 
 			m->m_flags &= ~M_VLANTAG;
 		}
 
-		if (err == 0)
-			dst_ifp->if_transmit(dst_ifp, m);
+		if ((err = dst_ifp->if_transmit(dst_ifp, m))) {
+			m_freem(m0);
+			break;
+		}
 	}
 
 	if (err == 0) {