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

l3cfg: during nm_l3_config_data_merge() collect the maximum of the metered flag

Browse source
This commit is contained in:
Thomas Haller 2020-10-27 18:56:45 +01:00
parent 3af02e8fcf
commit 6c835a2908
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nm-l3-config-data.c
View file

@ -2666,8 +2666,7 @@ nm_l3_config_data_merge(NML3ConfigData * self,
if (self->llmnr == NM_SETTING_CONNECTION_LLMNR_DEFAULT)
self->llmnr = src->llmnr;
if (self->metered == NM_TERNARY_DEFAULT)
self->metered = src->metered;
self->metered = NM_MAX((NMTernary) self->metered, (NMTernary) src->metered);
if (self->ip6_privacy == NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN)
self->ip6_privacy = src->ip6_privacy;