summary refs log tree commit diff
path: root/src/libnm-platform/nmp-object.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-08-09 18:57:15 +0200
committerMichael Biebl <biebl@debian.org>2024-08-09 18:57:15 +0200
commite96d74409128c6a977e31f24fad9b267d2feb9a1 (patch)
tree12dad71135c6c291de457568cb973208ea8a0024 /src/libnm-platform/nmp-object.h
parent45a364c60a9d6d34e614c4f1f507c69336ad1e69 (diff)
New upstream version 1.48.8 upstream/1.48.8
Diffstat (limited to 'src/libnm-platform/nmp-object.h')
-rw-r--r--src/libnm-platform/nmp-object.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/libnm-platform/nmp-object.h b/src/libnm-platform/nmp-object.h
index 9406f651..cd1793d4 100644
--- a/src/libnm-platform/nmp-object.h
+++ b/src/libnm-platform/nmp-object.h
@@ -952,15 +952,15 @@ const NMPObject *nmp_cache_lookup_link_full(const NMPCache  *cache,
                                             NMPObjectMatchFn match_fn,
                                             gpointer         user_data);
 
-gboolean         nmp_cache_link_connected_for_slave(int ifindex_master, const NMPObject *slave);
+gboolean         nmp_cache_link_connected_for_port(int ifindex_controller, const NMPObject *port);
 gboolean         nmp_cache_link_connected_needs_toggle(const NMPCache  *cache,
-                                                       const NMPObject *master,
-                                                       const NMPObject *potential_slave,
-                                                       const NMPObject *ignore_slave);
-const NMPObject *nmp_cache_link_connected_needs_toggle_by_ifindex(const NMPCache  *cache,
-                                                                  int              master_ifindex,
-                                                                  const NMPObject *potential_slave,
-                                                                  const NMPObject *ignore_slave);
+                                                       const NMPObject *controller,
+                                                       const NMPObject *potential_port,
+                                                       const NMPObject *ignore_port);
+const NMPObject *nmp_cache_link_connected_needs_toggle_by_ifindex(const NMPCache *cache,
+                                                                  int controller_ifindex,
+                                                                  const NMPObject *potential_port,
+                                                                  const NMPObject *ignore_port);
 
 gboolean nmp_cache_use_udev_get(const NMPCache *cache);
 
@@ -994,10 +994,10 @@ NMPCacheOpsType nmp_cache_update_link_udev(NMPCache           *cache,
                                            struct udev_device *udevice,
                                            const NMPObject   **out_obj_old,
                                            const NMPObject   **out_obj_new);
-NMPCacheOpsType nmp_cache_update_link_master_connected(NMPCache         *cache,
-                                                       int               ifindex,
-                                                       const NMPObject **out_obj_old,
-                                                       const NMPObject **out_obj_new);
+NMPCacheOpsType nmp_cache_update_link_controller_connected(NMPCache         *cache,
+                                                           int               ifindex,
+                                                           const NMPObject **out_obj_old,
+                                                           const NMPObject **out_obj_new);
 
 static inline const NMDedupMultiEntry *
 nmp_cache_reresolve_main_entry(NMPCache                *cache,