From owner-svn-src-all@FreeBSD.ORG  Tue Jul 10 20:59:36 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9C0CF106564A;
	Tue, 10 Jul 2012 20:59:36 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 86F0B8FC08;
	Tue, 10 Jul 2012 20:59:36 +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 q6AKxao6003161;
	Tue, 10 Jul 2012 20:59:36 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6AKxaJr003159;
	Tue, 10 Jul 2012 20:59:36 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201207102059.q6AKxaJr003159@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 10 Jul 2012 20:59:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238355 - head/sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jul 2012 20:59:36 -0000

Author: emaste
Date: Tue Jul 10 20:59:35 2012
New Revision: 238355
URL: http://svn.freebsd.org/changeset/base/238355

Log:
  Simplify error case
  
  Submitted by:	thompsa@

Modified:
  head/sys/net/if_bridge.c

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c	Tue Jul 10 19:48:42 2012	(r238354)
+++ head/sys/net/if_bridge.c	Tue Jul 10 20:59:35 2012	(r238355)
@@ -1811,10 +1811,10 @@ bridge_enqueue(struct bridge_softc *sc, 
 			m->m_flags &= ~M_VLANTAG;
 		}
 
-		if (err == 0)
-			err = dst_ifp->if_transmit(dst_ifp, m);
-		else
-			m_freem(m);
+		if ((err = dst_ifp->if_transmit(dst_ifp, m))) {
+			m_freem(m0);
+			break;
+		}
 	}
 
 	if (err == 0) {