Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/route6.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/route6.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- src/sys/netinet6/route6.c	2007/05/23 17:15:04	1.20
+++ src/sys/netinet6/route6.c	2007/10/29 16:54:43	1.21
@@ -1,4 +1,4 @@
-/*	$NetBSD: route6.c,v 1.20 2007/05/23 17:15:04 christos Exp $	*/
+/*	$NetBSD: route6.c,v 1.21 2007/10/29 16:54:43 dyoung Exp $	*/
 /*	$KAME: route6.c,v 1.22 2000/12/03 00:54:00 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route6.c,v 1.20 2007/05/23 17:15:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route6.c,v 1.21 2007/10/29 16:54:43 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -133,7 +133,7 @@ ip6_rthdr0(struct mbuf *m, struct ip6_hd
 {
 	int addrs, index;
 	struct in6_addr *nextaddr, tmpaddr;
-	struct in6_ifaddr *ifa;
+	const struct ip6aux *ip6a;
 
 	if (rh0->ip6r0_segleft == 0)
 		return (0);
@@ -190,9 +190,9 @@ ip6_rthdr0(struct mbuf *m, struct ip6_hd
 	 * of the current hop. [RFC4007, Section 9]
 	 * Then disambiguate the scope zone for the next hop (if necessary). 
 	 */
-	if ((ifa = ip6_getdstifaddr(m)) == NULL)
+	if ((ip6a = ip6_getdstifaddr(m)) == NULL)
 		goto bad;
-	if (in6_setscope(nextaddr, ifa->ia_ifp, NULL) != 0) {
+	if (in6_setzoneid(nextaddr, ip6a->ip6a_scope_id) != 0) {
 		ip6stat.ip6s_badscope++;
 		goto bad;
 	}