From fe246d1659245375139d2a17a3eddd42bc5d29ff Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 16 Oct 2015 18:26:38 +0200 Subject: [PATCH] platform/trivial: reorder declaration of structures in "nm-platform.h" Just group the NMPlatformLnk* types together and sort them by name. --- src/platform/nm-platform.h | 50 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 1bdf2fb612..39d766e0d2 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -340,30 +340,34 @@ typedef struct { extern const NMPlatformVTableRoute nm_platform_vtable_route_v4; extern const NMPlatformVTableRoute nm_platform_vtable_route_v6; +typedef struct { + int parent_ifindex; + guint16 input_flags; + guint16 output_flags; + guint32 input_key; + guint32 output_key; + in_addr_t local; + in_addr_t remote; + guint8 ttl; + guint8 tos; + gboolean path_mtu_discovery; +} NMPlatformLnkGre; + typedef struct { int p_key; const char *mode; } NMPlatformLnkInfiniband; -typedef struct { - /* rtnl_link_vlan_get_id(), IFLA_VLAN_ID */ - guint16 id; -} NMPlatformLnkVlan; - -typedef struct { - gint64 owner; - gint64 group; - const char *mode; - gboolean no_pi; - gboolean vnet_hdr; - gboolean multi_queue; -} NMPlatformTunProperties; - typedef struct { const char *mode; gboolean no_promisc; } NMPlatformLnkMacvlan; +typedef struct { + /* rtnl_link_vlan_get_id(), IFLA_VLAN_ID */ + guint16 id; +} NMPlatformLnkVlan; + typedef struct { int parent_ifindex; guint32 id; @@ -386,17 +390,13 @@ typedef struct { } NMPlatformLnkVxlan; typedef struct { - int parent_ifindex; - guint16 input_flags; - guint16 output_flags; - guint32 input_key; - guint32 output_key; - in_addr_t local; - in_addr_t remote; - guint8 ttl; - guint8 tos; - gboolean path_mtu_discovery; -} NMPlatformLnkGre; + gint64 owner; + gint64 group; + const char *mode; + gboolean no_pi; + gboolean vnet_hdr; + gboolean multi_queue; +} NMPlatformTunProperties; /******************************************************************/