diff options
| author | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
| commit | 5ebc16389d33662f712e49a8d5f3445f6b34ca05 (patch) | |
| tree | af14aec1d1271903e73ef2b45d6b9c6d6c188f44 /src/libnm-platform/nmp-object.h | |
| parent | f07580d7a481ecbc1e90033b7fa5607e0ab2d051 (diff) | |
| parent | e96d74409128c6a977e31f24fad9b267d2feb9a1 (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/libnm-platform/nmp-object.h')
| -rw-r--r-- | src/libnm-platform/nmp-object.h | 24 |
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, |