From 88a084bdec1b981ca79927dbff8cf6a3f267d621218c3726c23dda9672e559d1 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Fri, 25 Oct 2019 07:41:53 +0000
Subject: [PATCH] - tcp.7: correct documentation of tcp_fack, document
 tcp_recovery - added patches   [bsc#1154701]   + man-pages-tcp_fack.patch

OBS-URL: https://build.opensuse.org/package/show/Documentation/man-pages?expand=0&rev=194
---
 man-pages-tcp_fack.patch | 37 +++++++++++++++++++++++++++++++++++++
 man-pages.changes        |  8 ++++++++
 man-pages.spec           |  3 +++
 3 files changed, 48 insertions(+)
 create mode 100644 man-pages-tcp_fack.patch

diff --git a/man-pages-tcp_fack.patch b/man-pages-tcp_fack.patch
new file mode 100644
index 0000000..f8c5a84
--- /dev/null
+++ b/man-pages-tcp_fack.patch
@@ -0,0 +1,37 @@
+Index: man-pages-5.03/man7/tcp.7
+===================================================================
+--- man-pages-5.03.orig/man7/tcp.7	2019-10-11 10:56:08.000000000 +0200
++++ man-pages-5.03/man7/tcp.7	2019-10-25 09:36:55.047041318 +0200
+@@ -458,9 +458,31 @@ When enabled, outgoing ECN-setup SYNs th
+ normal SYN retransmission timeout will be resent with CWR and
+ ECE cleared.
+ .TP
+-.IR tcp_fack " (Boolean; default: enabled; since Linux 2.2)"
++.IR tcp_fack " (integer; default: see below; since Linux 2.2)"
+ .\" Since 2.1.92
+ Enable TCP Forward Acknowledgement support.
++
++Prior to Linux 4.11, this option was enabled by default.
++In Linux 4.11, it was disabled by default in favor of RACK (see
++tcp_recovery).
++In Linux 4.15 it was deprecated entirely and its value is ignored.
++.TP
++.IR tcp_recovery " (integer; default: 0x1; since Linux 4.4)"
++Enable various experimental loss recovery features.
++
++This field is a bitmap to enable various loss recovery features.
++.RS
++.IP 0x1
++enables the RACK loss detection for fast detection of lost
++retransmissions and tail drops. It also subsumes and disables
++RFC6675 recovery for SACK connections. (Since Linux 4.4)
++.IP 0x2
++makes RACK's reordering window static (min_rtt/4). (Since
++Linux 4.15)
++.IP 0x4
++disables RACK's DUPACK threshold heuristic (Since Linux
++4.18).
++.RE
+ .TP
+ .IR tcp_fin_timeout " (integer; default: 60; since Linux 2.2)"
+ .\" Since 2.1.53
diff --git a/man-pages.changes b/man-pages.changes
index 2215c2c..c52776f 100644
--- a/man-pages.changes
+++ b/man-pages.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 25 07:39:55 UTC 2019 - pgajdos@suse.com
+
+- tcp.7: correct documentation of tcp_fack, document tcp_recovery
+- added patches
+  [bsc#1154701]
+  + man-pages-tcp_fack.patch
+
 -------------------------------------------------------------------
 Mon Oct 14 06:47:17 UTC 2019 - pgajdos@suse.com
 
diff --git a/man-pages.spec b/man-pages.spec
index 0f18141..14c7b96 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -30,6 +30,8 @@ Patch0:         %{name}.eal3.diff
 Patch1:         %{name}-remove-ioctl_list-reference.patch
 Patch3:         %{name}_gai.conf-reference.patch
 Patch5:         %{name}-tty_ioctl.patch
+# [bsc#1154701]
+Patch6:         man-pages-tcp_fack.patch
 BuildRequires:  fdupes
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -51,6 +53,7 @@ only).
 %patch1 -p1
 %patch3
 %patch5 -p1
+%patch6 -p1
 find -name "*.orig" | xargs rm -fv
 
 %build