diff options
| author | Michael Biebl <biebl@debian.org> | 2015-08-28 01:14:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-08-28 01:14:03 +0200 |
| commit | 235f4801bff27219c6448c83874b5d9f8686ce58 (patch) | |
| tree | 7084e0f7d7a63901c21b56b67fbd3e203d5dbb80 /src/nm-iface-helper.c | |
| parent | 79436717ed9d593754a40402b6dc1b0cabac605e (diff) | |
| parent | 81836c2d44802b4cca833d7775dd627e0797a7e2 (diff) | |
Merge tag 'upstream/1.0.6'
Upstream version 1.0.6
Diffstat (limited to 'src/nm-iface-helper.c')
| -rw-r--r-- | src/nm-iface-helper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 2192f36b..18966c57 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -87,6 +87,7 @@ dhcp4_state_changed (NMDhcpClient *client, NMDhcpState state, NMIP4Config *ip4_config, GHashTable *options, + const char *event_id, gpointer user_data) { static NMIP4Config *last_config = NULL; @@ -103,7 +104,7 @@ dhcp4_state_changed (NMDhcpClient *client, if (last_config) nm_ip4_config_subtract (existing, last_config); - nm_ip4_config_merge (existing, ip4_config); + nm_ip4_config_merge (existing, ip4_config, NM_IP_CONFIG_MERGE_DEFAULT); if (!nm_ip4_config_commit (existing, ifindex, TRUE, global_opt.priority_v4)) nm_log_warn (LOGD_DHCP4, "(%s): failed to apply DHCPv4 config", global_opt.ifname); @@ -240,7 +241,7 @@ rdisc_config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed, gpointer user_da if (last_config) nm_ip6_config_subtract (existing, last_config); - nm_ip6_config_merge (existing, ip6_config); + nm_ip6_config_merge (existing, ip6_config, NM_IP_CONFIG_MERGE_DEFAULT); if (!nm_ip6_config_commit (existing, ifindex, TRUE)) nm_log_warn (LOGD_IP6, "(%s): failed to apply IPv6 config", global_opt.ifname); |