From 56513f5289d962689e5113477a011248222d6d6c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 2 Nov 2011 12:09:18 -0500 Subject: [PATCH] ip6: save autoconf config when starting DHCP Otherwise it just gets lost, and we want it later to combine with the DHCP config to get the final config that's applied to the interface. --- src/nm-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nm-device.c b/src/nm-device.c index 45660fb6d6..cb1324a9fc 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -1790,7 +1790,8 @@ ip6_addrconf_complete (NMIP6Manager *ip6_manager, nm_device_activate_schedule_ip6_config_result (self, priv->ac_ip6_config); break; case NM_ACT_STAGE_RETURN_POSTPONE: - /* Success; wait for DHCPv6 to complete */ + /* Cache acquired autoconf config and wait for DHCPv6 to complete */ + priv->ac_ip6_config = nm_ip6_manager_get_ip6_config (ip6_manager, ifindex); break; default: nm_device_state_changed (self, NM_DEVICE_STATE_FAILED, reason);