From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 15 Jan 2024 02:59:21 +0000 (+0900)
Subject: network/nexthop: reorder elements in NextHop
X-Git-Tag: v256-rc1~1146^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04a25cc425ff9651d375fbc14eeca3ebe48b5c20;p=thirdparty%2Fsystemd.git

network/nexthop: reorder elements in NextHop
---

diff --git a/src/network/networkd-nexthop.h b/src/network/networkd-nexthop.h
index bc2bacfa40d..18b30e28be8 100644
--- a/src/network/networkd-nexthop.h
+++ b/src/network/networkd-nexthop.h
@@ -26,15 +26,20 @@ typedef struct NextHop {
 
         unsigned n_ref;
 
-        uint8_t protocol;
-        int ifindex;
-        uint32_t id;
-        bool blackhole;
+        /* struct nhmsg */
         int family;
-        union in_addr_union gw;
+        uint8_t protocol;
         uint8_t flags;
-        int onlink; /* Only used in conf parser and nexthop_section_verify(). */
-        Hashmap *group;
+
+        /* attributes */
+        uint32_t id; /* NHA_ID */
+        Hashmap *group; /* NHA_GROUP */
+        bool blackhole; /* NHA_BLACKHOLE */
+        int ifindex; /* NHA_OIF */
+        union in_addr_union gw; /* NHA_GATEWAY */
+
+        /* Only used in conf parser and nexthop_section_verify(). */
+        int onlink;
 } NextHop;
 
 NextHop* nexthop_ref(NextHop *nexthop);