diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-03-09 14:39:55 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-03-09 14:40:09 +0100 |
| commit | 9dc1d7782ef792787b49b929d1b331429d23c68e (patch) | |
| tree | 0e00c571aa1962be78e02ce06348eb831231a2ee /sysdep | |
| parent | 6151e51ffaffd946cc1d7208aefd51acbac625d1 (diff) | |
| parent | 0767a0c288097dfaec45fe505c401407ecc5de55 (diff) | |
Merge commit '0767a0c2' into haugesund
Conflicts:
nest/rt-table.c
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/unix/krt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index 0a746631..b98e7ec0 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -566,7 +566,7 @@ krt_export_net(struct krt_proto *p, net *net) const struct filter *filter = c->out_filter; if (c->ra_mode == RA_MERGED) - return rt_export_merged(c, net, krt_filter_lp, 1); + return rt_export_merged_show(c, net, krt_filter_lp); static _Thread_local rte rt; rt = net->routes->rte; |