diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 14:14:00 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 14:14:00 +0200 |
| commit | fa84d1932b0da93815a6292d19af57acd81c7504 (patch) | |
| tree | 2b403f19ba362b74cce3d7687da1dedb00efc617 /zebra/label_manager.h | |
| parent | Merge branch 'frr/pull/569' (diff) | |
| parent | Revert "bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop" (diff) | |
| download | frr-fa84d1932b0da93815a6292d19af57acd81c7504.tar.xz frr-fa84d1932b0da93815a6292d19af57acd81c7504.zip | |
Merge branch 'stable/3.0'
Conflicts:
ldpd/lde.c
zebra/label_manager.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra/label_manager.h')
| -rw-r--r-- | zebra/label_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zebra/label_manager.h b/zebra/label_manager.h index a68c301f1..b7d6118a0 100644 --- a/zebra/label_manager.h +++ b/zebra/label_manager.h @@ -61,7 +61,7 @@ struct label_manager { bool lm_is_external; -int zread_relay_label_manager_request(int cmd, struct zserv *zserv); +int zread_relay_label_manager_request(int cmd, struct zserv *zserv, vrf_id_t vrf_id); void label_manager_init(char *lm_zserv_path); struct label_manager_chunk *assign_label_chunk(u_char proto, u_short instance, u_char keep, uint32_t size); |