about summary refs log tree commit diff
path: root/src/core/nm-bond-manager.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-08-09 18:57:26 +0200
committerMichael Biebl <biebl@debian.org>2024-08-09 18:57:26 +0200
commit5ebc16389d33662f712e49a8d5f3445f6b34ca05 (patch)
treeaf14aec1d1271903e73ef2b45d6b9c6d6c188f44 /src/core/nm-bond-manager.c
parentf07580d7a481ecbc1e90033b7fa5607e0ab2d051 (diff)
parente96d74409128c6a977e31f24fad9b267d2feb9a1 (diff)
Update upstream source from tag 'upstream/1.48.8'
Update to upstream version '1.48.8'
with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee
Diffstat (limited to 'src/core/nm-bond-manager.c')
-rw-r--r--src/core/nm-bond-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/nm-bond-manager.c b/src/core/nm-bond-manager.c
index 9985fccf..71cd4ee7 100644
--- a/src/core/nm-bond-manager.c
+++ b/src/core/nm-bond-manager.c
@@ -696,7 +696,7 @@ _reconfigure_check(NMBondManager *self, gboolean reapply)
     /* Find all the connected ports that are IFF_RUNNING. */
     pl_links_head_entry = nm_platform_lookup_obj_type(self->platform, NMP_OBJECT_TYPE_LINK);
     nmp_cache_iter_for_each_link (&pliter, pl_links_head_entry, &plink_port) {
-        if (plink_port->master != self->ifindex)
+        if (plink_port->controller != self->ifindex)
             continue;
         if (!NM_FLAGS_HAS(plink_port->n_ifi_flags, IFF_RUNNING))
             continue;
@@ -814,7 +814,7 @@ _link_changed_cb(NMPlatform           *platform,
     if (ifindex == self->ifindex)
         goto schedule;
 
-    if (plink->master == self->ifindex)
+    if (plink->controller == self->ifindex)
         goto schedule;
 
     if (g_hash_table_contains(self->previous_ifindexes, GINT_TO_POINTER(ifindex)))