Merge pull request #4328 from sworleys/Re-order-RouteEntry

zebra: Reorder `struct route_entry` to reduce size

diff --cc zebra/rib.h
index c39abaffccdc0a4b6188848c4fd7c3771a5cd680,141152b04f3eb323d43ce1c13ede7d02202fac5f..ca0801c20977486668c1e42cb19d50e9944ae394
--- 1/zebra/rib.h
--- 2/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