diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /zebra/rib.h | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'zebra/rib.h')
| -rw-r--r-- | zebra/rib.h | 3 |
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: |