svn commit: r306826 - head/sys/netinet6

[Mark Johnston]

Author: markj
Date: Fri Oct  7 21:02:30 2016
New Revision: 306826
URL: https://svnweb.freebsd.org/changeset/base/306826

Log:
  Combine several checks in nd6_prefix_offlink() into one.
  
  MFC after:	1 week

Modified:
  head/sys/netinet6/nd6_rtr.c

Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c	Fri Oct  7 20:01:59 2016	(r306825)
+++ head/sys/netinet6/nd6_rtr.c	Fri Oct  7 21:02:30 2016	(r306826)
@@ -1825,17 +1825,12 @@ nd6_prefix_offlink(struct nd_prefix *pr)
 		 * interface.
 		 */
 		LIST_FOREACH(opr, &V_nd_prefix, ndpr_entry) {
-			if (opr == pr)
-				continue;
-
-			if ((opr->ndpr_stateflags & NDPRF_ONLINK) != 0)
-				continue;
-
 			/*
 			 * KAME specific: detached prefixes should not be
 			 * on-link.
 			 */
-			if ((opr->ndpr_stateflags & NDPRF_DETACHED) != 0)
+			if (opr == pr || (opr->ndpr_stateflags &
+			    (NDPRF_ONLINK | NDPRF_DETACHED)) != 0)
 				continue;
 
 			if (opr->ndpr_plen == pr->ndpr_plen &&