1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt
index d569f2a424d5..9a0319a82470 100644
--- a/Documentation/sysctl/net.txt
+++ b/Documentation/sysctl/net.txt
@@ -50,6 +50,19 @@ The maximum number of packets that kernel can handle on a NAPI interrupt,
 it's a Per-CPU variable.
 Default: 64
+default_qdisc
+--------------
+The default queuing discipline to use for network devices. This allows
+overriding the default queue discipline of pfifo_fast with an
+alternative. Since the default queuing discipline is created with the
+no additional parameters so is best suited to queuing disciplines that
+work well without configuration like stochastic fair queue (sfq),
+CoDel (codel) or fair queue CoDel (fq_codel). Don't use queuing disciplines
+like Hierarchical Token Bucket or Deficit Round Robin which require setting
+up classes and bandwidths.
+Default: pfifo_fast
 busy_read
 ----------------
 Low latency busy poll timeout for socket reads. (needs CONFIG_NET_RX_BUSY_POLL)

diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt index d569f2a424d5..9a0319a82470 100644 --- a/Documentation/sysctl/net.txt +++ b/Documentation/sysctl/net.txt
@@ -50,6 +50,19 @@ The maximum number of packets that kernel can handle on a NAPI interrupt,
50	it's a Per-CPU variable.	50	it's a Per-CPU variable.
51	Default: 64	51	Default: 64
52		52
		53	default_qdisc
		54	--------------
		55
		56	The default queuing discipline to use for network devices. This allows
		57	overriding the default queue discipline of pfifo_fast with an
		58	alternative. Since the default queuing discipline is created with the
		59	no additional parameters so is best suited to queuing disciplines that
		60	work well without configuration like stochastic fair queue (sfq),
		61	CoDel (codel) or fair queue CoDel (fq_codel). Don't use queuing disciplines
		62	like Hierarchical Token Bucket or Deficit Round Robin which require setting
		63	up classes and bandwidths.
		64	Default: pfifo_fast
		65
53	busy_read	66	busy_read
54	----------------	67	----------------
55	Low latency busy poll timeout for socket reads. (needs CONFIG_NET_RX_BUSY_POLL)	68	Low latency busy poll timeout for socket reads. (needs CONFIG_NET_RX_BUSY_POLL)