ip6: save autoconf config when starting DHCP
authorDan Williams <dcbw@redhat.com>
Wed, 2 Nov 2011 17:09:18 +0000 (12:09 -0500)
committerDan Williams <dcbw@redhat.com>
Thu, 10 Nov 2011 03:36:52 +0000 (21:36 -0600)
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

index 45660fb..cb1324a 100644 (file)
@@ -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);