Index: sys/net/route.h
===================================================================
--- sys/net/route.h
+++ sys/net/route.h
@@ -427,7 +427,7 @@
 int	 rtrequest_fib(int, struct sockaddr *,
 	    struct sockaddr *, struct sockaddr *, int, struct rtentry **, u_int);
 int	 rtrequest1_fib(int, struct rt_addrinfo *, struct rtentry **, u_int);
-int	rib_lookup_info(uint32_t, const struct sockaddr *, uint32_t, uint32_t,
+int	rib_lookup_info(uint32_t, const struct sockaddr *, uint32_t,
 	    struct rt_addrinfo *);
 void	rib_free_info(struct rt_addrinfo *info);
 int	rib_add_redirect(u_int fibnum, struct sockaddr *dst,
Index: sys/net/route.c
===================================================================
--- sys/net/route.c
+++ sys/net/route.c
@@ -891,7 +891,7 @@
  */
 int
 rib_lookup_info(uint32_t fibnum, const struct sockaddr *dst, uint32_t flags,
-    uint32_t flowid, struct rt_addrinfo *info)
+    struct rt_addrinfo *info)
 {
 	RIB_RLOCK_TRACKER;
 	struct rib_head *rh;
Index: sys/net/rtsock.c
===================================================================
--- sys/net/rtsock.c
+++ sys/net/rtsock.c
@@ -634,7 +634,7 @@
 		 * AF_LINK sa_family type of the gateway, and the
 		 * rt_ifp has the IFF_LOOPBACK flag set.
 		 */
-		if (rib_lookup_info(fibnum, gdst, NHR_REF, 0, &ginfo) == 0) {
+		if (rib_lookup_info(fibnum, gdst, NHR_REF, &ginfo) == 0) {
 			if (ss.ss_family == AF_LINK &&
 			    ginfo.rti_ifp->if_flags & IFF_LOOPBACK) {
 				info->rti_flags &= ~RTF_GATEWAY;
Index: sys/netgraph/netflow/netflow.c
===================================================================
--- sys/netgraph/netflow/netflow.c
+++ sys/netgraph/netflow/netflow.c
@@ -366,7 +366,7 @@
 		info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&rt_gateway;
 		info.rti_info[RTAX_NETMASK] = (struct sockaddr *)&sin_mask;
 
-		if (rib_lookup_info(r->fib, (struct sockaddr *)&sin, NHR_REF, 0,
+		if (rib_lookup_info(r->fib, (struct sockaddr *)&sin, NHR_REF,
 		    &info) == 0) {
 			fle->f.fle_o_ifx = info.rti_ifp->if_index;
 
@@ -397,7 +397,7 @@
 
 		info.rti_info[RTAX_NETMASK] = (struct sockaddr *)&sin_mask;
 
-		if (rib_lookup_info(r->fib, (struct sockaddr *)&sin, 0, 0,
+		if (rib_lookup_info(r->fib, (struct sockaddr *)&sin, 0,
 		    &info) == 0) {
 			if (info.rti_addrs & RTA_NETMASK)
 				fle->f.src_mask =
@@ -463,7 +463,7 @@
 		info.rti_info[RTAX_NETMASK] = (struct sockaddr *)&sin6_mask;
 
 		if (rib_lookup_info(r->fib, (struct sockaddr *)&sin6, NHR_REF,
-		    0, &info) == 0) {
+		    &info) == 0) {
 			fle6->f.fle_o_ifx = info.rti_ifp->if_index;
 
 			if (info.rti_flags & RTF_GATEWAY &&
@@ -490,7 +490,7 @@
 
 		info.rti_info[RTAX_NETMASK] = (struct sockaddr *)&sin6_mask;
 
-		if (rib_lookup_info(r->fib, (struct sockaddr *)&sin6, 0, 0,
+		if (rib_lookup_info(r->fib, (struct sockaddr *)&sin6, 0,
 		    &info) == 0)
 			fle6->f.src_mask =
 			    ip6_masklen(&sin6_mask.sin6_addr, &info);
Index: sys/netinet/in.c
===================================================================
--- sys/netinet/in.c
+++ sys/netinet/in.c
@@ -1193,7 +1193,7 @@
 	info.rti_info[RTAX_NETMASK] = (struct sockaddr *)&rt_mask;
 	info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&rt_gateway;
 
-	if (rib_lookup_info(ifp->if_fib, l3addr, NHR_REF, 0, &info) != 0)
+	if (rib_lookup_info(ifp->if_fib, l3addr, NHR_REF, &info) != 0)
 		return (EINVAL);
 
 	rt_flags = info.rti_flags;
Index: sys/netinet6/nd6.c
===================================================================
--- sys/netinet6/nd6.c
+++ sys/netinet6/nd6.c
@@ -1285,7 +1285,7 @@
 				 * retrying lookup
 				 */
 				rt_key.sin6_len = sizeof(rt_key);
-				error = rib_lookup_info(fibnum, dst6, 0, 0,
+				error = rib_lookup_info(fibnum, dst6, 0,
 						        &info);
 
 				ND6_RLOCK();
Index: sys/netinet6/nd6_nbr.c
===================================================================
--- sys/netinet6/nd6_nbr.c
+++ sys/netinet6/nd6_nbr.c
@@ -269,7 +269,7 @@
 		info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&rt_gateway;
 
 		if (rib_lookup_info(ifp->if_fib, (struct sockaddr *)&dst6,
-		    0, 0, &info) == 0) {
+		    0, &info) == 0) {
 			if ((info.rti_flags & RTF_ANNOUNCE) != 0 &&
 			    rt_gateway.sdl_family == AF_LINK) {
 
Index: sys/netpfil/ipfw/ip_fw_table_algo.c
===================================================================
--- sys/netpfil/ipfw/ip_fw_table_algo.c
+++ sys/netpfil/ipfw/ip_fw_table_algo.c
@@ -4033,7 +4033,7 @@
 		key6.sin6_len = sizeof(struct sockaddr_in6);
 	}
 
-	if (rib_lookup_info(ti->data, key, 0, 0, &info) != 0)
+	if (rib_lookup_info(ti->data, key, 0, &info) != 0)
 		return (ENOENT);
 	if ((info.rti_addrs & RTA_NETMASK) == 0)
 		mask = NULL;