From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 26 Aug 2017 11:01:07 +0000 (+0200)
Subject: fix up tcp patch
X-Git-Tag: v3.18.68~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f95468be6047166cc02fd90ed48d206f4685a398;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up tcp patch
---

diff --git a/queue-3.18/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch b/queue-3.18/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
index d444d4dc761..156b2ef1c41 100644
--- a/queue-3.18/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
+++ b/queue-3.18/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  			 */
 -			if (delta > 0)
 -				rto = delta;
-+			delta = max(delta, 1);
++			rto = max(delta, 1);
  		}
  		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,
  					  TCP_RTO_MAX);
diff --git a/queue-4.4/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch b/queue-4.4/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
index bbc554ab627..027d6e422ab 100644
--- a/queue-4.4/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
+++ b/queue-4.4/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  			 */
 -			if (delta > 0)
 -				rto = delta;
-+			delta = max(delta, 1);
++			rto = max(delta, 1);
  		}
  		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,
  					  TCP_RTO_MAX);
diff --git a/queue-4.9/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch b/queue-4.9/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
index bce614bf152..b3e8a2796ad 100644
--- a/queue-4.9/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
+++ b/queue-4.9/tcp-when-rearming-rto-if-rto-time-is-in-past-then-fire-rto-asap.patch
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  			 */
 -			if (delta > 0)
 -				rto = delta;
-+			delta = max(delta, 1);
++			rto = max(delta, 1);
  		}
  		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,
  					  TCP_RTO_MAX);