diff options
author | Thomas Haller <thaller@redhat.com> | 2022-03-29 18:21:49 +0200 |
---|---|---|
committer | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2022-04-28 12:03:35 +0200 |
commit | 3a98ecfa0edce51c5ed8446bc3a74efc6ec6ac65 (patch) | |
tree | 713e4d953dc7d68637667d6992aeff73cfd1bf84 | |
parent | 9e40474c715e995c000b29db030b4a4990cc6e51 (diff) |
platform: make NMPlatformVTableAddress struct smaller and pack NMPObjectType
(cherry picked from commit 7c92663f8d79375c78f6917d4c6e005d7accf2a6)
-rw-r--r-- | src/libnm-platform/nm-platform.h | 6 | ||||
-rw-r--r-- | src/libnm-platform/nmp-base.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h index c6d6d6917a..93b644a3d8 100644 --- a/src/libnm-platform/nm-platform.h +++ b/src/libnm-platform/nm-platform.h @@ -776,10 +776,10 @@ typedef struct { #undef __NMPlatformObjWithIfindex_COMMON typedef struct { - gboolean is_ip4; + bool is_ip4; + gint8 addr_family; + guint8 sizeof_route; NMPObjectType obj_type; - int addr_family; - gsize sizeof_route; int (*route_cmp)(const NMPlatformIPXRoute *a, const NMPlatformIPXRoute *b, NMPlatformIPRouteCmpType cmp_type); diff --git a/src/libnm-platform/nmp-base.h b/src/libnm-platform/nmp-base.h index a80fd4d389..4863168855 100644 --- a/src/libnm-platform/nmp-base.h +++ b/src/libnm-platform/nmp-base.h @@ -110,7 +110,7 @@ typedef struct _NMPlatformIP6Route NMPlatformIP6Route; typedef struct _NMPlatformLink NMPlatformLink; typedef struct _NMPObject NMPObject; -typedef enum { +typedef enum _nm_packed { NMP_OBJECT_TYPE_UNKNOWN, NMP_OBJECT_TYPE_LINK, |