Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / Documentation / networking / ip-sysctl.rst

diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
index 25e6673..dd2b12a 100644 (file)
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -1554,6 +1554,9 @@ igmpv3_unsolicited_report_interval - INTEGER
 
        Default: 1000 (1 seconds)
 
+ignore_routes_with_linkdown - BOOLEAN
+        Ignore routes whose link is down when performing a FIB lookup.
+
 promote_secondaries - BOOLEAN
        When a primary IP address is removed from this interface
        promote a corresponding secondary IP address instead of
@@ -2642,6 +2645,37 @@ addr_scope_policy - INTEGER
 
        Default: 1
 
+udp_port - INTEGER
+       The listening port for the local UDP tunneling sock. Normally it's
+       using the IANA-assigned UDP port number 9899 (sctp-tunneling).
+
+       This UDP sock is used for processing the incoming UDP-encapsulated
+       SCTP packets (from RFC6951), and shared by all applications in the
+       same net namespace. This UDP sock will be closed when the value is
+       set to 0.
+
+       The value will also be used to set the src port of the UDP header
+       for the outgoing UDP-encapsulated SCTP packets. For the dest port,
+       please refer to 'encap_port' below.
+
+       Default: 0
+
+encap_port - INTEGER
+       The default remote UDP encapsulation port.
+
+       This value is used to set the dest port of the UDP header for the
+       outgoing UDP-encapsulated SCTP packets by default. Users can also
+       change the value for each sock/asoc/transport by using setsockopt.
+       For further information, please refer to RFC6951.
+
+       Note that when connecting to a remote server, the client should set
+       this to the port that the UDP tunneling sock on the peer server is
+       listening to and the local UDP tunneling sock on the client also
+       must be started. On the server, it would get the encap_port from
+       the incoming packet's source port.
+
+       Default: 0
+
 
 ``/proc/sys/net/core/*``
 ========================