[man-pages] - added description of the TCP_CONGESTION on the tcp(7) man page

pschiffe pschiffe at fedoraproject.org
Thu Oct 25 18:56:01 UTC 2012


commit d9fefcdf5c76688e516e6640e89ec7da1abf0b58
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Thu Oct 25 19:46:44 2012 +0200

    - added description of the TCP_CONGESTION on the tcp(7) man page

 man-pages-3.43-tcp-congestion.patch |   63 +++++++++++++++++++++++++++++++++++
 man-pages.spec                      |    4 ++
 2 files changed, 67 insertions(+), 0 deletions(-)
---
diff --git a/man-pages-3.43-tcp-congestion.patch b/man-pages-3.43-tcp-congestion.patch
new file mode 100644
index 0000000..818e734
--- /dev/null
+++ b/man-pages-3.43-tcp-congestion.patch
@@ -0,0 +1,63 @@
+diff -ur man-pages-3.43.orig/man7/tcp.7 man-pages-3.43/man7/tcp.7
+--- man-pages-3.43.orig/man7/tcp.7	2012-10-15 11:13:50.000000000 +0200
++++ man-pages-3.43/man7/tcp.7	2012-10-25 19:37:24.084706083 +0200
+@@ -820,7 +820,58 @@
+ socket options are valid on TCP sockets.
+ For more information see
+ .BR ip (7).
+-.\" FIXME Document TCP_CONGESTION (new in 2.6.13)
++.TP
++.BR TCP_CONGESTION " (since Linux 2.6.13)"
++Get or set the congestion-control algorithm for this socket.
++The
++.I optval
++argument is a pointer to a character-string buffer.
++
++For
++.BR getsockopt ()
++.I *optlen
++specifies the amount of space available in the buffer pointed to by
++.IR optval ,
++which should be at least 16 bytes (defined by the kernel-internal constant
++.BR TCP_CA_NAME_MAX ).
++On return, the buffer pointed to by
++.I optval
++is set to a null-terminated string containing the name of the
++congestion-control algorithm for this socket, and
++.I *optlen
++is set to the minimum of its original value and
++.BR TCP_CA_NAME_MAX .
++If the value passed in
++.I *optlen
++is too small, then the string returned in
++.I *optval
++is silently truncated, and no terminating null byte is added.
++If an empty string is returned, then the socket is using the default
++congestion-control algorithm, determined as described under
++.I tcp_congestion_control
++above.
++
++For
++.BR setsockopt ()
++.I optlen
++specifies the length of the congestion-control algorithm name
++contained in the buffer pointed to by
++.IR optval ;
++this length need not include any terminating null byte.
++The algorithm "reno" is always permitted;
++other algorithms may be available, depending on kernel configuration.
++Possible errors from
++.BR setsockopt ()
++include:
++algorithm not found/available
++.RB ( ENOENT );
++setting this algorithm requires the
++.B CAP_NET_ADMIN
++capability
++.RB ( EPERM );
++and failure getting kernel module
++.RB ( EBUSY ).
++.I
+ .TP
+ .BR TCP_CORK " (since Linux 2.2)"
+ .\" precisely: since 2.1.127
diff --git a/man-pages.spec b/man-pages.spec
index 0f08d10..f6af1b3 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -67,6 +67,8 @@ Patch56: man-pages-3.42-zdump.patch
 Patch57: man-pages-3.42-connect.patch
 # resolves: #202092
 Patch58: man-pages-3.42-sysconf.patch
+# resolves: #771540
+Patch59: man-pages-3.43-tcp-congestion.patch
 
 
 Autoreq: false
@@ -107,6 +109,7 @@ Documentation Project (LDP).
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
+%patch59 -p1
 
 ## Remove man pages we are not going to use ##
 
@@ -171,6 +174,7 @@ cd ..
 * Thu Oct 25 2012 Peter Schiffer <pschiffe at redhat.com> - 3.43-1
 - resolves: #866874
   updated to 3.43
+- added description of the TCP_CONGESTION on the tcp(7) man page
 
 * Wed Sep 19 2012 Peter Schiffer <pschiffe at redhat.com> - 3.42-1
 - resolves: #847941


More information about the scm-commits mailing list