From d0425f68f7ee83a1dc5a6ad3688627c1b472a58b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 30 Sep 2019 13:49:20 +0200 Subject: New upstream version 1.20.4 --- shared/n-dhcp4/src/n-dhcp4-c-probe.c | 2 +- shared/nm-version-macros.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'shared') diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c index f1ac3db7..107c18bb 100644 --- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c +++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c @@ -1009,7 +1009,7 @@ int n_dhcp4_client_probe_transition_accept(NDhcp4ClientProbe *probe, NDhcp4Incom probe->state = N_DHCP4_CLIENT_PROBE_STATE_BOUND; - /* XXX: trigger timers */ + n_dhcp4_client_arm_timer (probe->client); break; diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 92ab28d3..fdd0f353 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -44,7 +44,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (2) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: -- cgit 1.3.0-6-gf8a5