From owner-svn-src-head@FreeBSD.ORG  Mon Jun 22 09:24:46 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2FD4106564A;
	Mon, 22 Jun 2009 09:24:46 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9187D8FC20;
	Mon, 22 Jun 2009 09:24:46 +0000 (UTC) (envelope-from bz@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 n5M9OkT6033004;
	Mon, 22 Jun 2009 09:24:46 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5M9Ok2g033002;
	Mon, 22 Jun 2009 09:24:46 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200906220924.n5M9Ok2g033002@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Mon, 22 Jun 2009 09:24:46 +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: r194616 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jun 2009 09:24:47 -0000

Author: bz
Date: Mon Jun 22 09:24:46 2009
New Revision: 194616
URL: http://svn.freebsd.org/changeset/base/194616

Log:
  Remove a hack from r186086 so that IPsec via loopback routes continued
  working. It was targeted for stable/7 compatibility and actually never
  did anything in HEAD.
  
  Reminded by:	rwatson
  X-MFC after:	never

Modified:
  head/sys/netinet/in_pcb.c

Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c	Mon Jun 22 08:09:35 2009	(r194615)
+++ head/sys/netinet/in_pcb.c	Mon Jun 22 09:24:46 2009	(r194616)
@@ -705,10 +705,6 @@ in_pcbladdr(struct inpcb *inp, struct in
 			ia = ifatoia(ifa_ifwithnet(sintosa(&sain)));
 
 		if (cred == NULL || !prison_flag(cred, PR_IP4)) {
-#if __FreeBSD_version < 800000
-			if (ia == NULL)
-				ia = (struct in_ifaddr *)sro.ro_rt->rt_ifa;
-#endif
 			if (ia == NULL) {
 				error = ENETUNREACH;
 				goto done;