diff options
author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2020-10-30 03:47:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-30 03:47:15 +0100 |
commit | b131b5f539962c2a438cd7434bd83e14888437b7 (patch) | |
tree | b97d53c1c7a9b41f4aa70a8aa33eb05b15e9c5b3 /zebra/zebra_rib.c | |
parent | Merge pull request #7408 from volta-networks/fix_isis_p2p_passive (diff) | |
parent | zebra: Consolidate on 32 bits as the flag size for route flags (diff) | |
download | frr-b131b5f539962c2a438cd7434bd83e14888437b7.tar.xz frr-b131b5f539962c2a438cd7434bd83e14888437b7.zip |
Merge pull request #7414 from donaldsharp/32bitflags
zebra: Consolidate on 32 bits as the flag size for route flags
Diffstat (limited to 'zebra/zebra_rib.c')
-rw-r--r-- | zebra/zebra_rib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 093e1c409..e76ecc85a 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -3053,7 +3053,7 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p, } void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, - unsigned short instance, int flags, struct prefix *p, + unsigned short instance, uint32_t flags, struct prefix *p, struct prefix_ipv6 *src_p, const struct nexthop *nh, uint32_t nhe_id, uint32_t table_id, uint32_t metric, uint8_t distance, bool fromkernel, bool connected_down) @@ -3281,7 +3281,7 @@ void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, - unsigned short instance, int flags, struct prefix *p, + unsigned short instance, uint32_t flags, struct prefix *p, struct prefix_ipv6 *src_p, const struct nexthop *nh, uint32_t nhe_id, uint32_t table_id, uint32_t metric, uint32_t mtu, uint8_t distance, route_tag_t tag) |