diff options
author | Stephen Worley <sworley@cumulusnetworks.com> | 2019-10-23 20:50:30 +0200 |
---|---|---|
committer | Stephen Worley <sworley@cumulusnetworks.com> | 2019-10-25 17:13:44 +0200 |
commit | c1da832a948af638c3edd88fc3e5e5a5b5b3248c (patch) | |
tree | f7b3a122ffb1985b9085ae7db06164d5403d5a59 /zebra/zebra_nhg.h | |
parent | lib: Make nexthop_next* use const for nexthop (diff) | |
download | frr-c1da832a948af638c3edd88fc3e5e5a5b5b3248c.tar.xz frr-c1da832a948af638c3edd88fc3e5e5a5b5b3248c.zip |
zebra: Change wording of duplicate kernel nhg flag
Change the wording of the flag indicating we have received
a nexthop group from the kernel with a different ID but
is fundamentally identical to one we already have.
It was colliding with a flag of similar name in the nexthop struct.
Change it from NEXTHOP_GROUP_DUPLICATE -> NEXTHOP_GROUP_UNHASHABLE
since it is in fact unhashable.
Also change the wording of functions and comments referencing the same
problem.
Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_nhg.h')
-rw-r--r-- | zebra/zebra_nhg.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/zebra/zebra_nhg.h b/zebra/zebra_nhg.h index e5eb51862..82f54a3a6 100644 --- a/zebra/zebra_nhg.h +++ b/zebra/zebra_nhg.h @@ -99,10 +99,13 @@ struct nhg_hash_entry { */ #define NEXTHOP_GROUP_RECURSIVE (1 << 3) /* - * This is a duplicate nexthop we got from the kernel, we are only tracking - * it in our ID hash table, it is unusable by our routes. + * This is a nexthop group we got from the kernel, it is identical to + * one we already have. (The kernel allows duplicate nexthops, we don't + * since we hash on them). We are only tracking it in our ID table, + * it is unusable by our created routes but may be used by routes we get + * from the kernel. Therefore, it is unhashable. */ -#define NEXTHOP_GROUP_DUPLICATE (1 << 4) +#define NEXTHOP_GROUP_UNHASHABLE (1 << 4) }; /* Was this one we created, either this session or previously? */ |