diff options
Diffstat (limited to 'src/core/nm-l3-ipv4ll.c')
| -rw-r--r-- | src/core/nm-l3-ipv4ll.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/core/nm-l3-ipv4ll.c b/src/core/nm-l3-ipv4ll.c index 68cb17fb..2aedab56 100644 --- a/src/core/nm-l3-ipv4ll.c +++ b/src/core/nm-l3-ipv4ll.c @@ -600,7 +600,7 @@ _l3cd_config_add(NML3IPv4LL *self) nm_assert_not_reached(); self->l3cfg_commit_handle = nm_l3cfg_commit_type_register(self->l3cfg, - NM_L3_CFG_COMMIT_TYPE_ASSUME, + NM_L3_CFG_COMMIT_TYPE_UPDATE, self->l3cfg_commit_handle, "ipv4ll"); nm_l3cfg_commit_on_idle_schedule(self->l3cfg, NM_L3_CFG_COMMIT_TYPE_AUTO); @@ -748,12 +748,8 @@ _ipv4ll_set_timed_out_update(NML3IPv4LL *self, TimedOutState new_state) if (self->timed_out_expiry_msec == 0 || self->timed_out_expiry_msec < expiry_msec) { self->timed_out_expiry_msec = expiry_msec; nm_clear_g_source_inst(&self->timed_out_source); - self->timed_out_source = nm_g_timeout_source_new(timeout_msec, - G_PRIORITY_DEFAULT, - _ipv4ll_set_timed_out_timeout_cb, - self, - NULL); - g_source_attach(self->timed_out_source, NULL); + self->timed_out_source = + nm_g_timeout_add_source(timeout_msec, _ipv4ll_set_timed_out_timeout_cb, self); } break; } @@ -922,8 +918,7 @@ _ipv4ll_state_change_on_idle(NML3IPv4LL *self) if (!self->state_change_on_idle_source) { self->state_change_on_idle_source = - nm_g_idle_source_new(G_PRIORITY_DEFAULT, _ipv4ll_state_change_on_idle_cb, self, NULL); - g_source_attach(self->state_change_on_idle_source, NULL); + nm_g_idle_add_source(_ipv4ll_state_change_on_idle_cb, self); } } |