colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: fix crash in nm_device_reactivate_ip_config()

Browse Source 
Fixes: 87f69f0050 ('device: merge nm_device_reactivate_ip_config() implementations for IPv4/IPv6')
This commit is contained in:
Thomas Haller
2020-11-03 12:32:08 +01:00
parent affff881e2
commit 11068cf936
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/nm-device.c
View File

@@ -12263,10 +12263,10 @@ nm_device_reactivate_ip_config(NMDevice * self,
nm_device_get_route_metric(self, AF_INET6)); nm_device_get_route_metric(self, AF_INET6));
} }
method_old = nm_setting_ip_config_get_method(s_ip_old) method_old = (s_ip_old ? nm_setting_ip_config_get_method(s_ip_old) : NULL)
?: (IS_IPv4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED ?: (IS_IPv4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED
: NM_SETTING_IP6_CONFIG_METHOD_IGNORE); : NM_SETTING_IP6_CONFIG_METHOD_IGNORE);
method_new = nm_setting_ip_config_get_method(s_ip_new) method_new = (s_ip_new ? nm_setting_ip_config_get_method(s_ip_new) : NULL)
?: (IS_IPv4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED ?: (IS_IPv4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED
: NM_SETTING_IP6_CONFIG_METHOD_IGNORE); : NM_SETTING_IP6_CONFIG_METHOD_IGNORE);