From owner-svn-src-all@FreeBSD.ORG  Sun Aug 30 22:39:49 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92A5C106566B;
	Sun, 30 Aug 2009 22:39:49 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7FAEE8FC32;
	Sun, 30 Aug 2009 22:39:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UMdnqP008414;
	Sun, 30 Aug 2009 22:39:49 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7UMdnWb008412;
	Sun, 30 Aug 2009 22:39:49 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200908302239.n7UMdnWb008412@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Sun, 30 Aug 2009 22:39:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196672 - in stable/8/sys: . amd64/include/xen
	cddl/contrib/opensolaris contrib/dev/acpica contrib/pf
	dev/xen/xenpci netinet
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: Sun, 30 Aug 2009 22:39:49 -0000

Author: qingli
Date: Sun Aug 30 22:39:49 2009
New Revision: 196672
URL: http://svn.freebsd.org/changeset/base/196672

Log:
  MFC	r196608
  
  Do not try to free the rt_lle entry of the cached route in
  ip_output() if the cached route was not initialized from the
  flow-table. The rt_lle entry is invalid unless it has been
  initialized through the flow-table.
  
  Reviewed by:	kmacy, rwatson
  Approved by:	re

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/ip_output.c

Modified: stable/8/sys/netinet/ip_output.c
==============================================================================
--- stable/8/sys/netinet/ip_output.c	Sun Aug 30 22:36:46 2009	(r196671)
+++ stable/8/sys/netinet/ip_output.c	Sun Aug 30 22:39:49 2009	(r196672)
@@ -202,10 +202,8 @@ again:
 	if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
 			  dst->sin_family != AF_INET ||
 			  dst->sin_addr.s_addr != ip->ip_dst.s_addr)) {
-		if (!nortfree) {
+		if (!nortfree)
 			RTFREE(ro->ro_rt);
-			LLE_FREE(ro->ro_lle);
-		}
 		ro->ro_rt = (struct rtentry *)NULL;
 		ro->ro_lle = (struct llentry *)NULL;
 	}