From owner-svn-src-user@FreeBSD.ORG  Mon Nov 17 07:39:42 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 2B6F51065674;
	Mon, 17 Nov 2008 07:39:39 +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 D81F98FC18;
	Mon, 17 Nov 2008 07:39:39 +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 mAH7ddVQ076510;
	Mon, 17 Nov 2008 07:39:39 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAH7ddOe076509;
	Mon, 17 Nov 2008 07:39:39 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811170739.mAH7ddOe076509@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 17 Nov 2008 07:39:39 +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: r185022 - user/kmacy/HEAD_fast_multi_xmit/sys/netinet
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: Mon, 17 Nov 2008 07:39:42 -0000

Author: kmacy
Date: Mon Nov 17 07:39:39 2008
New Revision: 185022
URL: http://svn.freebsd.org/changeset/base/185022

Log:
  If ip_output_fast is being called from ip_output and there is no cached ARP,
  fall back to ip_output_legacy

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/netinet/ip_output.c

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/netinet/ip_output.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/netinet/ip_output.c	Mon Nov 17 07:09:40 2008	(r185021)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/netinet/ip_output.c	Mon Nov 17 07:39:39 2008	(r185022)
@@ -663,6 +663,13 @@ ip_output_fast(struct mbuf *m, struct mb
 			route_to_rtentry_info(ro, NULL, ri);
 		else if (flowtable_lookup(ipv4_ft, m, ri))
 			return (ENETUNREACH);
+
+		/*
+		 * Rather than reverting to non-standard ARP 
+		 * lookup semantics simply fallback to ip_output_legacy
+		 */
+		if ((ri->ri_flags & RTF_DESTEN_VALID) == 0)
+			return (EINVAL);
 	}
 
 	if (opt) {
@@ -1151,10 +1158,15 @@ int
 ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
     struct ip_moptions *imo, struct inpcb *inp)
 {
+	int error;
+
 	if (flowtable_enable)
-		return (ip_output_fast(m, opt, ro, flags, imo, inp));
-	else
-		return (ip_output_legacy(m, opt, ro, flags, imo, inp));
+		error = ip_output_fast(m, opt, ro, flags, imo, inp);
+	
+	if ((flowtable_enable == 0) || (error == EINVAL)) 
+		error = ip_output_legacy(m, opt, ro, flags, imo, inp);
+
+	return (error);
 }
 
 /*