git: bc5ef45aec3f - main - Fix drace CTF for the rib_head.

[Alexander V. Chernikov]

The branch main has been updated by melifaro:

URL: https://cgit.FreeBSD.org/src/commit/?id=bc5ef45aec3fa8acf2dd3408cebd207317543a8b

commit bc5ef45aec3fa8acf2dd3408cebd207317543a8b
Author:     Alexander V. Chernikov <melifaro at FreeBSD.org>
AuthorDate: 2021-04-27 07:47:53 +0000
Commit:     Alexander V. Chernikov <melifaro at FreeBSD.org>
CommitDate: 2021-04-27 07:47:53 +0000

    Fix drace CTF for the rib_head.
    
    33cb3cb2e321 introduced an `rib_head` structure field under the
    FIB_ALGO define. This may be problematic for the CTF, as some
     of the files including `route_var.h` do not have `fib_algo`
     defined.
    
    Make dtrace happy by making the field unconditional.
    
    Suggested by:   markj
---
 sys/net/route/route_var.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/net/route/route_var.h b/sys/net/route/route_var.h
index f12931476fd3..86fc64493e75 100644
--- a/sys/net/route/route_var.h
+++ b/sys/net/route/route_var.h
@@ -71,9 +71,7 @@ struct rib_head {
 	struct callout		expire_callout;	/* Callout for expiring dynamic routes */
 	time_t			next_expire;	/* Next expire run ts */
 	uint32_t		rnh_prefixes;	/* Number of prefixes */
-#ifdef FIB_ALGO
-	rt_gen_t		rnh_gen_rib;	/* rib generation counter */
-#endif
+	rt_gen_t		rnh_gen_rib;	/* fib algo: rib generation counter */
 	uint32_t		rib_dying:1;	/* rib is detaching */
 	uint32_t		rib_algo_fixed:1;/* fixed algorithm */
 	struct nh_control	*nh_control;	/* nexthop subsystem data */