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 d444d4dc7618a6b10d8d267c6cb801d57b79003a..156b2ef1c415e5955f7723e74b6b4976d1c873b0 100644 (file)
--- 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 bbc554ab6275637a3f5ea9d9c9ff224ae4a56cbf..027d6e422ab27986773911b5fb1ab35eeac1819f 100644 (file)
--- 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 bce614bf15213235ab6b33fabd9ae6a81c8f68af..b3e8a2796ad21834aab69868beeef2f2ed026fcd 100644 (file)
--- 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);