diff --git a/sys/netinet/in_fib_algo.c b/sys/netinet/in_fib_algo.c
--- a/sys/netinet/in_fib_algo.c
+++ b/sys/netinet/in_fib_algo.c
@@ -521,7 +521,7 @@
 		.sin_len = KEY_LEN_INET,
 		.sin_addr = key.addr4,
 	};
-	ent = (struct radix4_addr_entry *)(rnh->rnh_matchaddr(&addr4, &rnh->rh));
+	ent = (struct radix4_addr_entry *)(rn_match(&addr4, &rnh->rh));
 	if (ent != NULL)
 		return (ent->nhop);
 	return (NULL);
@@ -680,7 +680,7 @@
 
 	nh = NULL;
 	RIB_RLOCK(rh);
-	rn = rh->rnh_matchaddr((void *)&sin4, &rh->head);
+	rn = rn_match((void *)&sin4, &rh->head);
 	if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0))
 		nh = (RNTORT(rn))->rt_nhop;
 	RIB_RUNLOCK(rh);
diff --git a/sys/netinet6/in6_fib_algo.c b/sys/netinet6/in6_fib_algo.c
--- a/sys/netinet6/in6_fib_algo.c
+++ b/sys/netinet6/in6_fib_algo.c
@@ -106,7 +106,7 @@
 	};
 	if (IN6_IS_SCOPE_LINKLOCAL(key.addr6))
 		addr6.sin6_addr.s6_addr16[1] = htons(scopeid & 0xffff);
-	ent = (struct radix6_addr_entry *)(rnh->rnh_matchaddr(&addr6, &rnh->rh));
+	ent = (struct radix6_addr_entry *)(rn_match(&addr6, &rnh->rh));
 	if (ent != NULL)
 		return (ent->nhop);
 	return (NULL);
@@ -264,7 +264,7 @@
 
 	nh = NULL;
 	RIB_RLOCK(rh);
-	rn = rh->rnh_matchaddr((void *)&sin6, &rh->head);
+	rn = rn_match((void *)&sin6, &rh->head);
 	if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0))
 		nh = (RNTORT(rn))->rt_nhop;
 	RIB_RUNLOCK(rh);