summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide/sysctl/net.rst
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2026-06-29 11:32:44 -0400
committerSteven Rostedt <rostedt@goodmis.org>2026-06-29 11:32:44 -0400
commita13905ac604cfd28fbda0815da16127bd4069bbe (patch)
tree81c6504a0aae2c7d7ea118c7aff71ec943035ca7 /Documentation/admin-guide/sysctl/net.rst
parent56ece2fce5c00f577d92a376ba5dc4a2aa15925d (diff)
parentc35eb77a67515d4201bc91294f40761591f43bbd (diff)
downloadlinux-next-a13905ac604cfd28fbda0815da16127bd4069bbe.tar.gz
linux-next-a13905ac604cfd28fbda0815da16127bd4069bbe.zip
Merge tools/for-next
Diffstat (limited to 'Documentation/admin-guide/sysctl/net.rst')
-rw-r--r--Documentation/admin-guide/sysctl/net.rst11
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst
index 0724a793798f..3db464e006a3 100644
--- a/Documentation/admin-guide/sysctl/net.rst
+++ b/Documentation/admin-guide/sysctl/net.rst
@@ -36,12 +36,11 @@ Table : Subdirectories in /proc/sys/net
========= =================== = ========== ===================
802 E802 protocol mptcp Multipath TCP
appletalk Appletalk protocol netfilter Network Filter
- ax25 AX25 netrom NET/ROM
- bridge Bridging rose X.25 PLP layer
- core General parameter tipc TIPC
- ethernet Ethernet protocol unix Unix domain sockets
- ipv4 IP version 4 vsock VSOCK sockets
- ipv6 IP version 6 x25 X.25 protocol
+ bridge Bridging tipc TIPC
+ core General parameter unix Unix domain sockets
+ ethernet Ethernet protocol vsock VSOCK sockets
+ ipv4 IP version 4 x25 X.25 protocol
+ ipv6 IP version 6
========= =================== = ========== ===================
1. /proc/sys/net/core - Network core options