Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Oct 2016 21:03:19 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r306828 - head/sys/netinet6
Message-ID:  <201610072103.u97L3JrS016387@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Fri Oct  7 21:03:18 2016
New Revision: 306828
URL: https://svnweb.freebsd.org/changeset/base/306828

Log:
  Reduce the number of conditional statements in nd6_prefix_onlink().
  
  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 21:03:12 2016	(r306827)
+++ head/sys/netinet6/nd6_rtr.c	Fri Oct  7 21:03:18 2016	(r306828)
@@ -1734,11 +1734,11 @@ nd6_prefix_onlink(struct nd_prefix *pr)
 		/* XXX: freebsd does not have ifa_ifwithaf */
 		IF_ADDR_RLOCK(ifp);
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
-			if (ifa->ifa_addr->sa_family == AF_INET6)
+			if (ifa->ifa_addr->sa_family == AF_INET6) {
+				ifa_ref(ifa);
 				break;
+			}
 		}
-		if (ifa != NULL)
-			ifa_ref(ifa);
 		IF_ADDR_RUNLOCK(ifp);
 		/* should we care about ia6_flags? */
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610072103.u97L3JrS016387>