diff options
| author | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
| commit | 0bef21b7d9274778958532e84565e8b76f1204ee (patch) | |
| tree | 9b6f312103439539009916cbd7352d32853cc553 /shared | |
| parent | 857b32ce16c33d2fb191da77e9a3f3b542714d74 (diff) | |
| parent | d0425f68f7ee83a1dc5a6ad3688627c1b472a58b (diff) | |
Update upstream source from tag 'upstream/1.20.4'
Update to upstream version '1.20.4' with Debian dir a7248e22a7605bec597b9752dfceb6985ad68a67
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/n-dhcp4/src/n-dhcp4-c-probe.c | 2 | ||||
| -rw-r--r-- | shared/nm-version-macros.h | 2 |
2 files changed, 2 insertions, 2 deletions
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: |