diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-12-14 17:01:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-12-16 10:55:04 +0100 |
| commit | 2191e739ae8bdc969c1f3200dff02ac6f9dbd997 (patch) | |
| tree | bed6e54baab962111c2a577e4f8a60cfab39f5b3 | |
| parent | 0b1177cb181169723999ccee218f5ec8375bc718 (diff) | |
| download | NetworkManager-2191e739ae8bdc969c1f3200dff02ac6f9dbd997.tar.gz | |
platform: fix "-Wcast-align" warning for NMPlatformQdisc cast
| -rw-r--r-- | src/libnm-platform/nm-platform.h | 6 | ||||
| -rw-r--r-- | src/libnm-platform/tests/test-nm-platform.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h index eb25789628..edde7ddb40 100644 --- a/src/libnm-platform/nm-platform.h +++ b/src/libnm-platform/nm-platform.h @@ -531,7 +531,7 @@ typedef struct { guint8 ip_proto; /* FRA_IP_PROTO */ bool uid_range_has : 1; /* has(FRA_UID_RANGE) */ -} NMPlatformRoutingRule; +} _nm_alignas(NMPlatformObject) NMPlatformRoutingRule; #define NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET (~((guint32) 0)) @@ -599,7 +599,7 @@ typedef struct { NMPlatformQdiscSfq sfq; NMPlatformQdiscTbf tbf; }; -} NMPlatformQdisc; +} _nm_alignas(NMPlatformObject) NMPlatformQdisc; typedef struct { char sdata[32]; @@ -639,7 +639,7 @@ typedef struct { guint32 parent; guint32 info; NMPlatformAction action; -} NMPlatformTfilter; +} _nm_alignas(NMPlatformObject) NMPlatformTfilter; typedef struct { bool is_ip4; diff --git a/src/libnm-platform/tests/test-nm-platform.c b/src/libnm-platform/tests/test-nm-platform.c index 55c826751e..31c16e4def 100644 --- a/src/libnm-platform/tests/test-nm-platform.c +++ b/src/libnm-platform/tests/test-nm-platform.c @@ -31,6 +31,9 @@ G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPObjectLnkVlan)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPObjectLnkVrf)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPObjectLnkVxlan)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPObjectLnkWireGuard)); +G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPObjectQdisc)); +G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPObjectRoutingRule)); +G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPObjectTfilter)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformIP4Address)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformIP4Route)); @@ -57,6 +60,9 @@ G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformLnkVrf)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformLnkVxlan)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformLnkWireGuard)); G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformObjWithIfindex)); +G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformQdisc)); +G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformRoutingRule)); +G_STATIC_ASSERT(_nm_alignof(NMPlatformObject) == _nm_alignof(NMPlatformTfilter)); /*****************************************************************************/ |