New upstream version 1.40.0 upstream/1.40.0

2 files changed, 9 insertions, 15 deletions

diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
index ba05b6cd..1febe5df 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
@@ -51,7 +51,7 @@ NM_UTILS_STRING_TABLE_LOOKUP_DEFINE(
         }
     },
     { return NM_BOND_AD_SELECT_STABLE; },
-    {"bandwith", NM_BOND_AD_SELECT_BANDWIDTH},
+    {"bandwidth", NM_BOND_AD_SELECT_BANDWIDTH},
     {"count", NM_BOND_AD_SELECT_COUNT},
     {"stable", NM_BOND_AD_SELECT_STABLE}, );
 
@@ -512,14 +512,8 @@ nm_mptcp_flags_normalize(NMMptcpFlags flags)
     /* Clear all unknown flags. */
     flags &= _NM_MPTCP_FLAGS_ALL;
 
-    /* We must either set "enabled-on-global-iface" or "enabled". The
-     * former takes precedence, if they are both set.
-     *
-     * If neither is set, we default to "enabled".  */
-    if (NM_FLAGS_HAS(flags, NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE))
-        flags = NM_FLAGS_UNSET(flags, NM_MPTCP_FLAGS_ENABLED);
-    else
-        flags = NM_FLAGS_SET(flags, NM_MPTCP_FLAGS_ENABLED);
+    /* Not disabled means enabled. */
+    flags |= NM_MPTCP_FLAGS_ENABLED;
 
     if (NM_FLAGS_ALL(flags, NM_MPTCP_FLAGS_SIGNAL | NM_MPTCP_FLAGS_FULLMESH))
         flags = NM_FLAGS_UNSET(flags, NM_MPTCP_FLAGS_FULLMESH);
diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.h b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
index 5c827c01..0208bfdb 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.h
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
@@ -269,13 +269,13 @@ gpointer _nm_connection_new_setting(NMConnection *connection, GType gtype);
 
 /*****************************************************************************/
 
-#define _NM_MPTCP_FLAGS_ALL                                                                    \
-    ((NMMptcpFlags) (NM_MPTCP_FLAGS_DISABLED | NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE          \
-                     | NM_MPTCP_FLAGS_ENABLED | NM_MPTCP_FLAGS_SIGNAL | NM_MPTCP_FLAGS_SUBFLOW \
-                     | NM_MPTCP_FLAGS_BACKUP | NM_MPTCP_FLAGS_FULLMESH))
+#define _NM_MPTCP_FLAGS_ALL                                                              \
+    ((NMMptcpFlags) (NM_MPTCP_FLAGS_DISABLED | NM_MPTCP_FLAGS_ENABLED                    \
+                     | NM_MPTCP_FLAGS_ALSO_WITHOUT_SYSCTL                                \
+                     | NM_MPTCP_FLAGS_ALSO_WITHOUT_DEFAULT_ROUTE | NM_MPTCP_FLAGS_SIGNAL \
+                     | NM_MPTCP_FLAGS_SUBFLOW | NM_MPTCP_FLAGS_BACKUP | NM_MPTCP_FLAGS_FULLMESH))
 
-#define _NM_MPTCP_FLAGS_DEFAULT \
-    ((NMMptcpFlags) (NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE | NM_MPTCP_FLAGS_SUBFLOW))
+#define _NM_MPTCP_FLAGS_DEFAULT ((NMMptcpFlags) (NM_MPTCP_FLAGS_ENABLED | NM_MPTCP_FLAGS_SUBFLOW))
 
 NMMptcpFlags nm_mptcp_flags_normalize(NMMptcpFlags flags);