Module Name:    src
Committed By:   roy
Date:           Thu Aug 18 09:34:43 UTC 2016

Modified Files:
        src/sys/netinet6: in6.c

Log Message:
Revert part of the prior patch so loopback lladdr gets a working prefix route.


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/netinet6/in6.c

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

Modified files:

Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.216 src/sys/netinet6/in6.c:1.217
--- src/sys/netinet6/in6.c:1.216	Tue Aug 16 10:31:57 2016
+++ src/sys/netinet6/in6.c	Thu Aug 18 09:34:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6.c,v 1.216 2016/08/16 10:31:57 roy Exp $	*/
+/*	$NetBSD: in6.c,v 1.217 2016/08/18 09:34:43 roy Exp $	*/
 /*	$KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.216 2016/08/16 10:31:57 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.217 2016/08/18 09:34:43 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -257,9 +257,6 @@ in6_ifaddprefix(struct in6_ifaddr *ia)
 			/* We don't need to install a host route. */
 			return 0;
 		flags |= RTF_HOST;
-	} else if (ia->ia_ifp->if_flags & IFF_LOOPBACK) {
-		/* Loopback prefix routes are always host routes. */
-		flags |= RTF_HOST;
 	}
 
 	/* Is this a connected route for neighbour discovery? */
@@ -1741,8 +1738,6 @@ in6_ifinit(struct ifnet *ifp, struct in6
 	}
 
 	/* Add the network prefix route. */
-	if (ia->ia_ifp->if_flags & IFF_LOOPBACK)
-		ia->ia_ifa.ifa_dstaddr = ia->ia_ifa.ifa_addr;
 	if ((error = in6_ifaddprefix(ia)) != 0) {
 		if (newhost)
 			in6_ifremlocal(&ia->ia_ifa);

Reply via email to