diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-09-07 10:35:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-09-07 11:14:27 +0200 |
| commit | cac10198f652d216c688c69e2ab8dcfb51435498 (patch) | |
| tree | 202ccdbb2705a160d030f03a27200d789ff743b9 /src/vpn | |
| parent | c8e6f3e5fb9cd8dd80b8a7278338d0e9064be97f (diff) | |
| download | NetworkManager-cac10198f652d216c688c69e2ab8dcfb51435498.tar.gz | |
vpn: apply parent config in nm_vpn_connection_apply_config() first
In practice, it shouldn't matter much, because NM may frequently
reapply the IP config. Hence, it anyway must cope with the fact that
IP config from a previous iteration is already applied on the VPN device,
before applying it to the parent device.
Anyway, it makes a bit more sense to apply it first the the parent device.
Diffstat (limited to 'src/vpn')
| -rw-r--r-- | src/vpn/nm-vpn-connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index 1a858060f0..284a909aac 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -1135,6 +1135,8 @@ nm_vpn_connection_apply_config (NMVpnConnection *self) { NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + apply_parent_device_config (self); + if (priv->ip_ifindex > 0) { nm_platform_link_set_up (nm_netns_get_platform (priv->netns), priv->ip_ifindex, NULL); @@ -1157,8 +1159,6 @@ nm_vpn_connection_apply_config (NMVpnConnection *self) nm_platform_link_set_mtu (nm_netns_get_platform (priv->netns), priv->ip_ifindex, priv->mtu); } - apply_parent_device_config (self); - nm_default_route_manager_ip4_update_default_route (nm_netns_get_default_route_manager (priv->netns), self); nm_default_route_manager_ip6_update_default_route (nm_netns_get_default_route_manager (priv->netns), self); |