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

device: commit the l3cd changes via l3cfg during cleanup

Browse source 
After the first time committing, the routes and addresses are removed
directly by bypassing the l3cfg in `nm_device_cleanup()`, then when
committing the second time, the l3cfg think that some addresses are
still configured but they are actually already disappeared from the
kernel already.

To fix it, commit the l3cd changes through l3cfg instead of removing
the addresses/routes directly.
This commit is contained in:
Wen Liang 2022-02-15 14:00:18 -05:00
parent 59c60cccf5
commit 9f6114afe8
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/core/devices/nm-device.c
View file

@ -15079,8 +15079,7 @@ nm_device_cleanup(NMDevice *self, NMDeviceStateReason reason, CleanupType cleanu
if (ifindex > 0) { if (ifindex > 0) {
NMPlatform *platform = nm_device_get_platform(self); NMPlatform *platform = nm_device_get_platform(self);
nm_platform_ip_route_flush(platform, AF_UNSPEC, ifindex); nm_device_l3cfg_commit(self, NM_L3_CFG_COMMIT_TYPE_REAPPLY, TRUE);
nm_platform_ip_address_flush(platform, AF_UNSPEC, ifindex);
if (nm_device_get_applied_setting(self, NM_TYPE_SETTING_TC_CONFIG)) { if (nm_device_get_applied_setting(self, NM_TYPE_SETTING_TC_CONFIG)) {
nm_platform_tc_sync(platform, ifindex, NULL, NULL); nm_platform_tc_sync(platform, ifindex, NULL, NULL);