From owner-svn-src-user@FreeBSD.ORG  Thu Feb 14 00:56:40 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8FC2421F;
 Thu, 14 Feb 2013 00:56:40 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6CC06AD5;
 Thu, 14 Feb 2013 00:56:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1E0udOu090394;
 Thu, 14 Feb 2013 00:56:39 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1E0udQ6090393;
 Thu, 14 Feb 2013 00:56:39 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201302140056.r1E0udQ6090393@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 14 Feb 2013 00:56:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r246777 - user/ae/inet6/sys/netinet6
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 14 Feb 2013 00:56:40 -0000

Author: ae
Date: Thu Feb 14 00:56:39 2013
New Revision: 246777
URL: http://svnweb.freebsd.org/changeset/base/246777

Log:
  Use in6ifa_ifwithaddr() instead of ip6_getdstifaddr.

Modified:
  user/ae/inet6/sys/netinet6/frag6.c

Modified: user/ae/inet6/sys/netinet6/frag6.c
==============================================================================
--- user/ae/inet6/sys/netinet6/frag6.c	Thu Feb 14 00:43:36 2013	(r246776)
+++ user/ae/inet6/sys/netinet6/frag6.c	Thu Feb 14 00:56:39 2013	(r246777)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/scope6_var.h>
 #include <netinet/icmp6.h>
 #include <netinet/in_systm.h>	/* for ECN definitions */
 #include <netinet/ip.h>		/* for ECN definitions */
@@ -184,7 +185,9 @@ frag6_input(struct mbuf **mp, int *offp,
 	dstifp = NULL;
 #ifdef IN6_IFSTAT_STRICT
 	/* find the destination interface of the packet. */
-	if ((ia = ip6_getdstifaddr(m)) != NULL) {
+	ia = in6ifa_ifwithaddr(&ip6->ip6_dst, in6_getscopezone(
+	    m->m_pkthdr.rcvif, in6_addrscope(&ip6->ip6_dst)));
+	if (ia != NULL) {
 		dstifp = ia->ia_ifp;
 		ifa_free(&ia->ia_ifa);
 	}