From: Jörg Thalheim <joerg@thalheim.io>
Date: Thu, 28 Mar 2019 16:20:52 +0000 (+0000)
Subject: wireguard: fix exponential backoff when resolving hosts
X-Git-Tag: v242-rc1~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7232c1f9da0904de479b17dc58410b972639bb4e;p=thirdparty%2Fsystemd.git

wireguard: fix exponential backoff when resolving hosts

It should stop at 25s, not start.
Fixes #12134
---

diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
index 03eaac1f9cb..5d9df16349c 100644
--- a/src/network/netdev/wireguard.c
+++ b/src/network/netdev/wireguard.c
@@ -322,7 +322,7 @@ static int on_resolve_retry(sd_event_source *s, usec_t usec, void *userdata) {
  * increasing time in milliseconds to wait starting at 200ms and capped at 25 seconds.
  */
 static int exponential_backoff_milliseconds(unsigned n_retries) {
-        return (2 << MAX(n_retries, 7U)) * 100 * USEC_PER_MSEC;
+        return (2 << MIN(n_retries, 7U)) * 100 * USEC_PER_MSEC;
 }
 
 static int wireguard_resolve_handler(sd_resolve_query *q,