diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
| commit | be5e48abecd137b47e4493a8fd616186c61f48f7 (patch) | |
| tree | 4184faeca4bb606af98deb606d9b53db3ac314b4 /zebra/zebra_rnh_null.c | |
| parent | 526e17284570266dcdd606ff163a614e6b3655a5 (diff) | |
| parent | 2bed4e86e378334341e01f3afe33784ef2713e83 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Conflicts:
zebra/rib.h
zebra/zebra_rib.c
zebra/zebra_vty.c
Diffstat (limited to 'zebra/zebra_rnh_null.c')
| -rw-r--r-- | zebra/zebra_rnh_null.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zebra_rnh_null.c b/zebra/zebra_rnh_null.c index 5bd00a3ecd..58fba418af 100644 --- a/zebra/zebra_rnh_null.c +++ b/zebra/zebra_rnh_null.c @@ -6,11 +6,11 @@ int zebra_rnh_ip_default_route = 0; int zebra_rnh_ipv6_default_route = 0; -int zebra_evaluate_rnh (int vrfid, int family, int force, rnh_type_t type, +int zebra_evaluate_rnh (vrf_id_t vrfid, int family, int force, rnh_type_t type, struct prefix *p) { return 0; } -void zebra_print_rnh_table (int vrfid, int family, struct vty *vty, +void zebra_print_rnh_table (vrf_id_t vrfid, int family, struct vty *vty, rnh_type_t type) {} |