diff mbox

Add missing descriptions for fwmark_reflect for ipv4 and ipv6.

Message ID 20141029172915.GA15714@mx.elandsys.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Loganaden Velvindron Oct. 29, 2014, 5:29 p.m. UTC
Hi guys,

It was initially sent by Lorenzo Colitti, but was subsequently
lost in the final diff he submitted.

(It's my first time sending a diff to netdev, please let me know if
I made a mistake)

Signed-off-by: Loganaden Velvindron <logan@elandsys.com>
---
 Documentation/networking/ip-sysctl.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Comments

David Miller Oct. 30, 2014, 8:11 p.m. UTC | #1
From: Loganaden Velvindron <logan@elandsys.com>
Date: Wed, 29 Oct 2014 10:29:15 -0700

> (It's my first time sending a diff to netdev, please let me know if
> I made a mistake)

Please don't put text like this into the commit log message body.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 0307e28..a476b08 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -56,6 +56,13 @@  ip_forward_use_pmtu - BOOLEAN
 	0 - disabled
 	1 - enabled
 
+fwmark_reflect - BOOLEAN
+	Controls the fwmark of kernel-generated IPv4 reply packets that are not
+	associated with a socket for example, TCP RSTs or ICMP echo replies).
+	If unset, these packets have a fwmark of zero. If set, they have the
+	fwmark of the packet they are replying to.
+	Default: 0
+
 route/max_size - INTEGER
 	Maximum number of routes allowed in the kernel.  Increase
 	this when using large numbers of interfaces and/or routes.
@@ -1201,6 +1208,13 @@  conf/all/forwarding - BOOLEAN
 proxy_ndp - BOOLEAN
 	Do proxy ndp.
 
+fwmark_reflect - BOOLEAN
+	Controls the fwmark of kernel-generated IPv6 reply packets that are not
+	associated with a socket for example, TCP RSTs or ICMPv6 echo replies).
+	If unset, these packets have a fwmark of zero. If set, they have the
+	fwmark of the packet they are replying to.
+	Default: 0
+
 conf/interface/*:
 	Change special settings per interface.