* [PATCH net] doc: move seg6_flowlabel to seg6-sysctl.rst
@ 2021-04-14 10:00 Nicolas Dichtel
2021-04-14 20:20 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Dichtel @ 2021-04-14 10:00 UTC (permalink / raw)
To: davem, kuba; +Cc: netdev, Nicolas Dichtel
Let's have all seg6 sysctl at the same place.
Fixes: a6dc6670cd7e ("ipv6: sr: Add documentation for seg_flowlabel sysctl")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
Documentation/networking/ip-sysctl.rst | 15 ---------------
Documentation/networking/seg6-sysctl.rst | 13 +++++++++++++
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
index c7952ac5bd2f..3feb5e565b1a 100644
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -1849,21 +1849,6 @@ ip6frag_low_thresh - INTEGER
ip6frag_time - INTEGER
Time in seconds to keep an IPv6 fragment in memory.
-IPv6 Segment Routing:
-
-seg6_flowlabel - INTEGER
- Controls the behaviour of computing the flowlabel of outer
- IPv6 header in case of SR T.encaps
-
- == =======================================================
- -1 set flowlabel to zero.
- 0 copy flowlabel from Inner packet in case of Inner IPv6
- (Set flowlabel to 0 in case IPv4/L2)
- 1 Compute the flowlabel using seg6_make_flowlabel()
- == =======================================================
-
- Default is 0.
-
``conf/default/*``:
Change the interface-specific default settings.
diff --git a/Documentation/networking/seg6-sysctl.rst b/Documentation/networking/seg6-sysctl.rst
index ec73e1445030..07c20e470baf 100644
--- a/Documentation/networking/seg6-sysctl.rst
+++ b/Documentation/networking/seg6-sysctl.rst
@@ -24,3 +24,16 @@ seg6_require_hmac - INTEGER
* 1 - Drop SR packets without HMAC, validate SR packets with HMAC
Default is 0.
+
+seg6_flowlabel - INTEGER
+ Controls the behaviour of computing the flowlabel of outer
+ IPv6 header in case of SR T.encaps
+
+ == =======================================================
+ -1 set flowlabel to zero.
+ 0 copy flowlabel from Inner packet in case of Inner IPv6
+ (Set flowlabel to 0 in case IPv4/L2)
+ 1 Compute the flowlabel using seg6_make_flowlabel()
+ == =======================================================
+
+ Default is 0.
--
2.30.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] doc: move seg6_flowlabel to seg6-sysctl.rst
2021-04-14 10:00 [PATCH net] doc: move seg6_flowlabel to seg6-sysctl.rst Nicolas Dichtel
@ 2021-04-14 20:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-04-14 20:20 UTC (permalink / raw)
To: Nicolas Dichtel; +Cc: davem, kuba, netdev
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Wed, 14 Apr 2021 12:00:27 +0200 you wrote:
> Let's have all seg6 sysctl at the same place.
>
> Fixes: a6dc6670cd7e ("ipv6: sr: Add documentation for seg_flowlabel sysctl")
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> ---
> Documentation/networking/ip-sysctl.rst | 15 ---------------
> Documentation/networking/seg6-sysctl.rst | 13 +++++++++++++
> 2 files changed, 13 insertions(+), 15 deletions(-)
Here is the summary with links:
- [net] doc: move seg6_flowlabel to seg6-sysctl.rst
https://git.kernel.org/netdev/net/c/292ecd9f5a94
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-14 20:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14 10:00 [PATCH net] doc: move seg6_flowlabel to seg6-sysctl.rst Nicolas Dichtel
2021-04-14 20:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).