diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2016-10-07 21:02:30 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2016-10-07 21:02:30 +0000 |
| commit | 7b0e84b7c8d75ad37ecb4d7b4cb3ac782d72d811 (patch) | |
| tree | 418150b351c618cd6ca75742349922ef4fcec9c2 | |
| parent | 9a999549583b2ac10f7d00b8d1c91cd45ef8cf5c (diff) | |
| download | src-7b0e84b7c8d75ad37ecb4d7b4cb3ac782d72d811.tar.gz src-7b0e84b7c8d75ad37ecb4d7b4cb3ac782d72d811.zip | |
Combine several checks in nd6_prefix_offlink() into one.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=306826
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 5097992fe704..c00ef9d4f844 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -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 && |