fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 14:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: cleanup code path in nm_device_get_ip_iface_identifier()

Browse source
This commit is contained in:
Thomas Haller 2022-04-02 13:33:00 +02:00
parent eaba1f30a6
commit 976e2eeb93
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4724,7 +4724,7 @@ nm_device_get_ip_iface_identifier(NMDevice *self,
gboolean *out_is_token)
{
NMSettingIP6Config *s_ip6;
const char *token = NULL;
const char *token;
g_return_val_if_fail(NM_IS_DEVICE(self), FALSE);
@ -4736,13 +4736,12 @@ nm_device_get_ip_iface_identifier(NMDevice *self,
g_return_val_if_fail(s_ip6, FALSE);
token = nm_setting_ip6_config_get_token(s_ip6);
if (token)
if (token) {
NM_SET_OUT(out_is_token, TRUE);
return nm_utils_ipv6_interface_identifier_get_from_token(iid, token);
}
}
if (token)
return nm_utils_ipv6_interface_identifier_get_from_token(iid, token);
else
return NM_DEVICE_GET_CLASS(self)->get_ip_iface_identifier(self, iid);
return NM_DEVICE_GET_CLASS(self)->get_ip_iface_identifier(self, iid);
}
const char *