From e96d74409128c6a977e31f24fad9b267d2feb9a1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 9 Aug 2024 18:57:15 +0200 Subject: New upstream version 1.48.8 --- src/n-dhcp4/src/util/link.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/n-dhcp4') diff --git a/src/n-dhcp4/src/util/link.c b/src/n-dhcp4/src/util/link.c index 54d9a5c3..ec7836d1 100644 --- a/src/n-dhcp4/src/util/link.c +++ b/src/n-dhcp4/src/util/link.c @@ -223,28 +223,28 @@ void link_del_ip4(Link *link, const struct in_addr *addr, unsigned int prefix) { } /** - * link_set_master() - change the bridge master of an interface - * @link: link to operate on - * @if_master: bridge to set as master + * link_set_controller() - change the bridge controller of an interface + * @link: link to operate on + * @if_controller: bridge to set as controller * - * This sets @if_master as the new master bridge of @link. The specified bridge + * This sets @if_controller as the new controller bridge of @link. The specified bridge * must be in the same network namespace as @link. */ -void link_set_master(Link *link, int if_master) { +void link_set_controller(Link *link, int if_controller) { int oldns; netns_get(&oldns); { - char *p, ifname_master[IF_NAMESIZE + 1] = {}, ifname[IF_NAMESIZE + 1] = {}; + char *p, ifname_controller[IF_NAMESIZE + 1] = {}, ifname[IF_NAMESIZE + 1] = {}; int r; netns_set(link->netns); p = if_indextoname(link->ifindex, ifname); c_assert(p); - p = if_indextoname(if_master, ifname_master); + p = if_indextoname(if_controller, ifname_controller); c_assert(p); - r = asprintf(&p, "ip link set %s master %s", ifname, ifname_master); + r = asprintf(&p, "ip link set %s master %s", ifname, ifname_controller); c_assert(r > 0); r = system(p); c_assert(r == 0); -- cgit 1.3.0-6-gf8a5