Update upstream source from tag 'upstream/1.48.8'

Update to upstream version '1.48.8'
with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libnmc-base/nm-client-utils.c b/src/libnmc-base/nm-client-utils.c
index 4c180e09..4516bc3b 100644
--- a/src/libnmc-base/nm-client-utils.c
+++ b/src/libnmc-base/nm-client-utils.c
@@ -575,14 +575,14 @@ nmc_activation_get_effective_state(NMActiveConnection *active,
         }
         break;
     case NM_ACTIVE_CONNECTION_STATE_ACTIVATING:
-        /* activating master connection does not automatically activate any slaves, so their
+        /* activating controller connection does not automatically activate any ports, so their
          * active connection state will not progress beyond ACTIVATING state.
          * Monitor the device instead. */
         if (device
             && (NM_IS_DEVICE_BOND(device) || NM_IS_DEVICE_TEAM(device)
                 || NM_IS_DEVICE_BRIDGE(device))
             && dev_state >= NM_DEVICE_STATE_IP_CONFIG && dev_state <= NM_DEVICE_STATE_ACTIVATED) {
-            *reason = "master waiting for slaves";
+            *reason = "controller waiting for ports";
             return NM_ACTIVE_CONNECTION_STATE_ACTIVATED;
         }
         break;