From 36d6aa3bcd97f2144e8f435249ed8f3cb709ae43 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 1 May 2019 12:58:37 +0200
Subject: [PATCH] platform: use bool bitfields in NMPlatformActionMirred
 structure

Arguably, the structure is used inside a union with another (larger)
struct, hence no memory is saved.

In fact, it may well be slower performance wise to access a boolean bitfield
than a gboolean (int).

Still, boolean fields in structures should be bool:1 bitfields for
consistency.
---
 src/platform/nm-platform.c | 19 ++++++++++---------
 src/platform/nm-platform.h |  8 ++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index ea73f21019..ee71319dd6 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -6577,11 +6577,12 @@ nm_platform_tfilter_hash_update (const NMPlatformTfilter *obj, NMHashState *h)
 			nm_hash_update_strarr (h, obj->action.simple.sdata);
 		} else if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
 			nm_hash_update_vals (h,
-			                     obj->action.mirred.ingress,
-			                     obj->action.mirred.egress,
-			                     obj->action.mirred.mirror,
-			                     obj->action.mirred.redirect,
-			                     obj->action.mirred.ifindex);
+			                     obj->action.mirred.ifindex,
+			                     NM_HASH_COMBINE_BOOLS (guint8,
+			                                            obj->action.mirred.ingress,
+			                                            obj->action.mirred.egress,
+			                                            obj->action.mirred.mirror,
+			                                            obj->action.mirred.redirect));
 		}
 	}
 }
@@ -6602,11 +6603,11 @@ nm_platform_tfilter_cmp (const NMPlatformTfilter *a, const NMPlatformTfilter *b)
 		if (nm_streq (a->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE)) {
 			NM_CMP_FIELD_STR (a, b, action.simple.sdata);
 		} else if (nm_streq (a->action.kind, NM_PLATFORM_ACTION_KIND_MIRRED)) {
-			NM_CMP_FIELD (a, b, action.mirred.ingress);
-			NM_CMP_FIELD (a, b, action.mirred.egress);
-			NM_CMP_FIELD (a, b, action.mirred.mirror);
-			NM_CMP_FIELD (a, b, action.mirred.redirect);
 			NM_CMP_FIELD (a, b, action.mirred.ifindex);
+			NM_CMP_FIELD_UNSAFE (a, b, action.mirred.ingress);
+			NM_CMP_FIELD_UNSAFE (a, b, action.mirred.egress);
+			NM_CMP_FIELD_UNSAFE (a, b, action.mirred.mirror);
+			NM_CMP_FIELD_UNSAFE (a, b, action.mirred.redirect);
 		}
 	}
 
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 5a0efceca7..9b6848d977 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -641,11 +641,11 @@ typedef struct {
 } NMPlatformActionSimple;
 
 typedef struct {
-	gboolean egress;
-	gboolean ingress;
-	gboolean mirror;
-	gboolean redirect;
 	int ifindex;
+	bool egress:1;
+	bool ingress:1;
+	bool mirror:1;
+	bool redirect:1;
 } NMPlatformActionMirred;
 
 typedef struct {