summaryrefslogtreecommitdiff
path: root/src/devices
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-05-27 11:34:31 +0200
committerThomas Haller <thaller@redhat.com>2015-05-29 11:43:58 +0200
commit49227a07f3e71033f7d10023cfe5a39334f335cb (patch)
treeb2f601dbf896609bae3e052e933c7cab6ef45a74 /src/devices
parent242fe0bfb0bf5e8f772506012ebdad4d129d0a5c (diff)
downloadNetworkManager-49227a07f3e71033f7d10023cfe5a39334f335cb.tar.gz
default-route: add @out_is_never_default argument to has_default_route()
Also accept a NULL connection in nm_default_route_manager_ip4_connection_has_default_route() and nm_default_route_manager_ip6_connection_has_default_route().
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/nm-device.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 043d6dbe87..0a17637e68 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -3127,8 +3127,7 @@ ip4_config_merge_and_apply (NMDevice *self,
* configured. */
priv->default_route.v4_is_assumed = FALSE;
- if ( !connection
- || !nm_default_route_manager_ip4_connection_has_default_route (nm_default_route_manager_get (), connection))
+ if (!nm_default_route_manager_ip4_connection_has_default_route (nm_default_route_manager_get (), connection, NULL))
goto END_ADD_DEFAULT_ROUTE;
if (!nm_ip4_config_get_num_addresses (composite)) {
@@ -3709,8 +3708,7 @@ ip6_config_merge_and_apply (NMDevice *self,
* configured. */
priv->default_route.v6_is_assumed = FALSE;
- if ( !connection
- || !nm_default_route_manager_ip6_connection_has_default_route (nm_default_route_manager_get (), connection))
+ if (!nm_default_route_manager_ip6_connection_has_default_route (nm_default_route_manager_get (), connection, NULL))
goto END_ADD_DEFAULT_ROUTE;
if (!nm_ip6_config_get_num_addresses (composite)) {