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 /nest/rt-show.c | |
| parent | 6151e51ffaffd946cc1d7208aefd51acbac625d1 (diff) | |
| parent | 0767a0c288097dfaec45fe505c401407ecc5de55 (diff) | |
Merge commit '0767a0c2' into haugesund
Conflicts:
nest/rt-table.c
Diffstat (limited to 'nest/rt-show.c')
| -rw-r--r-- | nest/rt-show.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nest/rt-show.c b/nest/rt-show.c index 7b05c64e..117d6e00 100644 --- a/nest/rt-show.c +++ b/nest/rt-show.c @@ -143,7 +143,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) { /* Special case for merged export */ pass = 1; - rte *em = rt_export_merged(ec, n, c->show_pool, 1); + rte *em = rt_export_merged_show(ec, n, c->show_pool); if (em) e = *em; else |