From: Renato Westphal Date: Mon, 20 May 2019 13:20:47 +0000 (-0300) Subject: Merge pull request #4328 from sworleys/Re-order-RouteEntry X-Git-Tag: base_7.2~328 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8844902c11aebafb4321a73dd2bac3632465d83a;p=matthieu%2Ffrr.git Merge pull request #4328 from sworleys/Re-order-RouteEntry zebra: Reorder `struct route_entry` to reduce size --- 8844902c11aebafb4321a73dd2bac3632465d83a diff --cc zebra/rib.h index c39abaffcc,141152b04f..ca0801c209 --- a/zebra/rib.h +++ b/zebra/rib.h @@@ -146,12 -140,14 +140,18 @@@ struct route_entry /* Sequence value incremented for each dataplane operation */ uint32_t dplane_sequence; + + /* Source protocol instance */ + uint16_t instance; + + /* Distance. */ + uint8_t distance; }; +#define RIB_SYSTEM_ROUTE(R) RSYSTEM_ROUTE((R)->type) + +#define RIB_KERNEL_ROUTE(R) RKERNEL_ROUTE((R)->type) + /* meta-queue structure: * sub-queue 0: connected, kernel * sub-queue 1: static