diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-07-29 20:53:58 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-07-29 20:53:58 +0200 |
| commit | 42fc558ee36561c3a024d21e89aacf68b88d25a0 (patch) | |
| tree | b76ef94021793567770076105fce447bc392c84f /zebra/rib.h | |
| parent | zebra: Remove repeated enqueueing of system routes for rethinking (diff) | |
| download | frr-42fc558ee36561c3a024d21e89aacf68b88d25a0.tar.xz frr-42fc558ee36561c3a024d21e89aacf68b88d25a0.zip | |
zebra, tests: Remove ROUTE_ENTRY_NEXTHOPS_CHANGED
The flag ROUTE_ENTRY_NEXTHOPS_CHANGED is only ever set or unset.
Since this flag is not used for anything useful, remove from system.
By changing this flag we have re-ordered `internalStatus' of json
output of zebra rib routes. Go through and fix up tetsts to
use the new values.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/rib.h')
| -rw-r--r-- | zebra/rib.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/zebra/rib.h b/zebra/rib.h index 181286a90..b82428e54 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -124,18 +124,16 @@ struct route_entry { /* RIB internal status */ uint32_t status; #define ROUTE_ENTRY_REMOVED 0x1 -/* to simplify NHT logic when NHs change, instead of doing a NH by NH cmp */ -#define ROUTE_ENTRY_NEXTHOPS_CHANGED 0x2 /* The Route Entry has changed */ -#define ROUTE_ENTRY_CHANGED 0x4 +#define ROUTE_ENTRY_CHANGED 0x2 /* The Label has changed on the Route entry */ -#define ROUTE_ENTRY_LABELS_CHANGED 0x8 +#define ROUTE_ENTRY_LABELS_CHANGED 0x4 /* Route is queued for Installation into the Data Plane */ -#define ROUTE_ENTRY_QUEUED 0x10 +#define ROUTE_ENTRY_QUEUED 0x8 /* Route is installed into the Data Plane */ -#define ROUTE_ENTRY_INSTALLED 0x20 +#define ROUTE_ENTRY_INSTALLED 0x10 /* Route has Failed installation into the Data Plane in some manner */ -#define ROUTE_ENTRY_FAILED 0x40 +#define ROUTE_ENTRY_FAILED 0x20 /* Nexthop information. */ uint8_t nexthop_num; |