From 6c835a290835bb4179e2c6452845d63cec945ede Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 27 Oct 2020 18:56:45 +0100
Subject: [PATCH] l3cfg: during nm_l3_config_data_merge() collect the maximum
 of the metered flag

---
 src/nm-l3-config-data.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/nm-l3-config-data.c b/src/nm-l3-config-data.c
index 3f6db67c61..c02cb78cb3 100644
--- a/src/nm-l3-config-data.c
+++ b/src/nm-l3-config-data.c
@@ -2666,8 +2666,7 @@ nm_l3_config_data_merge(NML3ConfigData *      self,
     if (self->llmnr == NM_SETTING_CONNECTION_LLMNR_DEFAULT)
         self->llmnr = src->llmnr;
 
-    if (self->metered == NM_TERNARY_DEFAULT)
-        self->metered = src->metered;
+    self->metered = NM_MAX((NMTernary) self->metered, (NMTernary) src->metered);
 
     if (self->ip6_privacy == NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN)
         self->ip6_privacy = src->ip6_privacy;