fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 06:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: minor cleanup of dispatching function in nm_device_activate_schedule_ip_config_timeout()

Browse source
This commit is contained in:
Thomas Haller 2021-08-20 10:26:47 +02:00
parent fb94903444
commit 31b74aab34
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/devices/nm-device.c
View file

@ -11744,11 +11744,14 @@ activate_stage4_ip_config_timeout_6(NMDevice *self)
activate_stage4_ip_config_timeout_x(self, AF_INET6);
}
#define activate_stage4_ip_config_timeout_x_fcn(addr_family) \
(NM_IS_IPv4(addr_family) ? activate_stage4_ip_config_timeout_4 \
: activate_stage4_ip_config_timeout_6)
void
nm_device_activate_schedule_ip_config_timeout(NMDevice *self, int addr_family)
{
NMDevicePrivate *priv;
const int IS_IPv4 = NM_IS_IPv4(addr_family);
g_return_if_fail(NM_IS_DEVICE(self));
g_return_if_fail(NM_IN_SET(addr_family, AF_INET, AF_INET6));
@ -11758,8 +11761,7 @@ nm_device_activate_schedule_ip_config_timeout(NMDevice *self, int addr_family)
g_return_if_fail(priv->act_request.obj);
activation_source_schedule(self,
IS_IPv4 ? activate_stage4_ip_config_timeout_4
: activate_stage4_ip_config_timeout_6,
activate_stage4_ip_config_timeout_x_fcn(addr_family),
addr_family);
}