summaryrefslogtreecommitdiff
path: root/zebra/rib.h
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-01-06 09:58:21 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-01-06 09:58:21 -0500
commit3b14d86eed3c042db718c7e006ca5299f473c88e (patch)
tree4efde6b2d77f5229ace3375da3471b0db1daa695 /zebra/rib.h
parent0b0038b8bcf84beda44fb69a60b2620b0387d8e8 (diff)
parent7d53a49360ddceb16db34bc8a84039cb2ecab22c (diff)
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'zebra/rib.h')
-rw-r--r--zebra/rib.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/zebra/rib.h b/zebra/rib.h
index 30929f1beb..d80ea6cbd8 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -93,7 +93,6 @@ struct rib
/* Nexthop information. */
u_char nexthop_num;
u_char nexthop_active_num;
- u_char nexthop_fib_num;
};
/* meta-queue structure:
@@ -335,7 +334,7 @@ extern int zebra_check_addr (struct prefix *p);
extern void rib_addnode (struct route_node *rn, struct rib *rib, int process);
extern void rib_delnode (struct route_node *rn, struct rib *rib);
-extern int rib_install_kernel (struct route_node *rn, struct rib *rib, int update);
+extern int rib_install_kernel (struct route_node *rn, struct rib *rib, struct rib *old);
extern int rib_uninstall_kernel (struct route_node *rn, struct rib *rib);
/* NOTE: