From owner-svn-src-user@FreeBSD.ORG  Tue Nov  4 06:30:20 2008
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 94A6F10656E4;
	Tue,  4 Nov 2008 06:30:20 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 83DED8FC21;
	Tue,  4 Nov 2008 06:30:20 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA46UKxP088530;
	Tue, 4 Nov 2008 06:30:20 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA46UKBm088529;
	Tue, 4 Nov 2008 06:30:20 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811040630.mA46UKBm088529@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 4 Nov 2008 06:30:20 +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: r184619 - user/kmacy/HEAD_multi_tx/sys/net
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: Tue, 04 Nov 2008 06:30:20 -0000

Author: kmacy
Date: Tue Nov  4 06:30:20 2008
New Revision: 184619
URL: http://svn.freebsd.org/changeset/base/184619

Log:
  replace IFQ_HANDOFF in ether_output_frame with call to ifp's if_start_mbuf

Modified:
  user/kmacy/HEAD_multi_tx/sys/net/if_ethersubr.c

Modified: user/kmacy/HEAD_multi_tx/sys/net/if_ethersubr.c
==============================================================================
--- user/kmacy/HEAD_multi_tx/sys/net/if_ethersubr.c	Tue Nov  4 06:29:15 2008	(r184618)
+++ user/kmacy/HEAD_multi_tx/sys/net/if_ethersubr.c	Tue Nov  4 06:30:20 2008	(r184619)
@@ -408,7 +408,6 @@ bad:			if (m != NULL)
 int
 ether_output_frame(struct ifnet *ifp, struct mbuf *m)
 {
-	int error;
 #if defined(INET) || defined(INET6)
 	INIT_VNET_NET(ifp->if_vnet);
 	struct ip_fw *rule = ip_dn_claim_rule(m);
@@ -428,8 +427,7 @@ ether_output_frame(struct ifnet *ifp, st
 	 * Queue message on interface, update output statistics if
 	 * successful, and start output if interface not yet active.
 	 */
-	IFQ_HANDOFF(ifp, m, error);
-	return (error);
+	return ((ifp->if_start_mbuf)(ifp, m));
 }
 
 #if defined(INET) || defined(INET6)