diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-04-27 07:47:53 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-05-04 21:31:25 +0000 |
| commit | 939c41f3b89b18054b59a4432fdf18d583377849 (patch) | |
| tree | 43d3b1c79c0da8a04e2a1fa5468319bf1ca17745 | |
| parent | d0666c87184f977442fec32a820cac63b5334bbd (diff) | |
| download | src-939c41f3b89b18054b59a4432fdf18d583377849.tar.gz src-939c41f3b89b18054b59a4432fdf18d583377849.zip | |
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
(cherry picked from commit bc5ef45aec3fa8acf2dd3408cebd207317543a8b)
| -rw-r--r-- | sys/net/route/route_var.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net/route/route_var.h b/sys/net/route/route_var.h index ad397104209b..b29b79c88864 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 */ uint32_t rib_algo_init:1;/* algo init done */ |