From 28bbe2a7980158f10ea6cbab2077ea5848c16411 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 13 Oct 2020 11:11:25 +0200
Subject: [PATCH] shared,platform: take pointer to NMEtherAddr in
 NM_ETHER_ADDR_FORMAT_VAL() macro

It seems nicer to require a pointer than the plain struct.
---
 shared/nm-glib-aux/nm-macros-internal.h | 10 +++++-----
 shared/nm-glib-aux/nm-shared-utils.h    |  8 +++++---
 src/platform/nm-platform.c              |  2 +-
 src/platform/tests/test-common.c        |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index cabe7edcff..7f9e8d178b 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -656,11 +656,11 @@ NM_G_ERROR_MSG(GError *error)
 
 #if _NM_CC_SUPPORT_GENERIC
     /* returns @value, if the type of @value matches @type.
- * This requires support for C11 _Generic(). If no support is
- * present, this returns @value directly.
- *
- * It's useful to check the let the compiler ensure that @value is
- * of a certain type. */
+     * This requires support for C11 _Generic(). If no support is
+     * present, this returns @value directly.
+     *
+     * It's useful to check the let the compiler ensure that @value is
+     * of a certain type. */
     #define _NM_ENSURE_TYPE(type, value) (_Generic((value), type : (value)))
     #define _NM_ENSURE_TYPE_CONST(type, value)              \
         (_Generic((value), const type                       \
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 675a93fe57..887e00c2a4 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -88,9 +88,11 @@ typedef struct {
 } NMEtherAddr;
 
 #define NM_ETHER_ADDR_FORMAT_STR "%02X:%02X:%02X:%02X:%02X:%02X"
-#define NM_ETHER_ADDR_FORMAT_VAL(x)                                            \
-    (x).ether_addr_octet[0], (x).ether_addr_octet[1], (x).ether_addr_octet[2], \
-        (x).ether_addr_octet[3], (x).ether_addr_octet[4], (x).ether_addr_octet[5]
+
+#define NM_ETHER_ADDR_FORMAT_VAL(x)                                               \
+    (x)->ether_addr_octet[0], (x)->ether_addr_octet[1], (x)->ether_addr_octet[2], \
+        (x)->ether_addr_octet[3], (x)->ether_addr_octet[4], (x)->ether_addr_octet[5]
+
 #define NM_ETHER_ADDR_INIT(...)            \
     {                                      \
         .ether_addr_octet = {__VA_ARGS__}, \
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index d1ff6fbc42..2823d73c94 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -5641,7 +5641,7 @@ nm_platform_lnk_bridge_to_string(const NMPlatformLnkBridge *lnk, char *buf, gsiz
                lnk->vlan_protocol,
                (int) lnk->vlan_stats_enabled,
                lnk->group_fwd_mask,
-               NM_ETHER_ADDR_FORMAT_VAL(lnk->group_addr),
+               NM_ETHER_ADDR_FORMAT_VAL(&lnk->group_addr),
                (int) lnk->mcast_snooping,
                lnk->mcast_router,
                (int) lnk->mcast_query_use_ifaddr,
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c
index 14cee4c315..a7fe590567 100644
--- a/src/platform/tests/test-common.c
+++ b/src/platform/tests/test-common.c
@@ -1477,7 +1477,7 @@ nmtstp_link_bridge_add(NMPlatform *               platform,
             lnk->group_fwd_mask != 0
                 ? nm_sprintf_buf(sbuf_gfw, "group_fwd_mask %#x ", lnk->group_fwd_mask)
                 : "",
-            NM_ETHER_ADDR_FORMAT_VAL(lnk->group_addr),
+            NM_ETHER_ADDR_FORMAT_VAL(&lnk->group_addr),
             (int) lnk->mcast_snooping,
             lnk->mcast_router,
             (int) lnk->mcast_query_use_ifaddr,