1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/networking/multiqueue.txt b/Documentation/networking/multiqueue.txt
index 8c2b06b77f61..4caa0e314cc2 100644
--- a/Documentation/networking/multiqueue.txt
+++ b/Documentation/networking/multiqueue.txt
@@ -29,15 +29,15 @@ Section 2: Qdisc support for multiqueue devices
 -----------------------------------------------
-Currently two qdiscs support multiqueue devices.  The first is the default
+Currently two qdiscs are optimized for multiqueue devices.  The first is the
-pfifo_fast qdisc.  This qdisc supports one qdisc per hardware queue.  A new
+default pfifo_fast qdisc.  This qdisc supports one qdisc per hardware queue.
-round-robin qdisc, sch_multiq also supports multiple hardware queues. The
+A new round-robin qdisc, sch_multiq also supports multiple hardware queues. The
 qdisc is responsible for classifying the skb's and then directing the skb's to
 bands and queues based on the value in skb->queue_mapping.  Use this field in
 the base driver to determine which queue to send the skb to.
-sch_multiq has been added for hardware that wishes to avoid unnecessary
+sch_multiq has been added for hardware that wishes to avoid head-of-line
-requeuing.  It will cycle though the bands and verify that the hardware queue
+blocking.  It will cycle though the bands and verify that the hardware queue
 associated with the band is not stopped prior to dequeuing a packet.
 On qdisc load, the number of bands is based on the number of queues on the
@@ -63,8 +63,8 @@ band 1 => queue 1
 band 2 => queue 2
 band 3 => queue 3
-Traffic will begin flowing through each queue if your base device has either
+Traffic will begin flowing through each queue based on either the simple_tx_hash
-the default simple_tx_hash or a custom netdev->select_queue() defined.
+function or based on netdev->select_queue() if you have it defined.
 The behavior of tc filters remains the same.  However a new tc action,
 skbedit, has been added.  Assuming you wanted to route all traffic to a

diff --git a/Documentation/networking/multiqueue.txt b/Documentation/networking/multiqueue.txt index 8c2b06b77f61..4caa0e314cc2 100644 --- a/Documentation/networking/multiqueue.txt +++ b/Documentation/networking/multiqueue.txt
@@ -29,15 +29,15 @@ Section 2: Qdisc support for multiqueue devices
29		29
30	-----------------------------------------------	30	-----------------------------------------------
31		31
32	Currently two qdiscs support multiqueue devices. The first is the default	32	Currently two qdiscs are optimized for multiqueue devices. The first is the
33	pfifo_fast qdisc. This qdisc supports one qdisc per hardware queue. A new	33	default pfifo_fast qdisc. This qdisc supports one qdisc per hardware queue.
34	round-robin qdisc, sch_multiq also supports multiple hardware queues. The	34	A new round-robin qdisc, sch_multiq also supports multiple hardware queues. The
35	qdisc is responsible for classifying the skb's and then directing the skb's to	35	qdisc is responsible for classifying the skb's and then directing the skb's to
36	bands and queues based on the value in skb->queue_mapping. Use this field in	36	bands and queues based on the value in skb->queue_mapping. Use this field in
37	the base driver to determine which queue to send the skb to.	37	the base driver to determine which queue to send the skb to.
38		38
39	sch_multiq has been added for hardware that wishes to avoid unnecessary	39	sch_multiq has been added for hardware that wishes to avoid head-of-line
40	requeuing. It will cycle though the bands and verify that the hardware queue	40	blocking. It will cycle though the bands and verify that the hardware queue
41	associated with the band is not stopped prior to dequeuing a packet.	41	associated with the band is not stopped prior to dequeuing a packet.
42		42
43	On qdisc load, the number of bands is based on the number of queues on the	43	On qdisc load, the number of bands is based on the number of queues on the
@@ -63,8 +63,8 @@ band 1 => queue 1
63	band 2 => queue 2	63	band 2 => queue 2
64	band 3 => queue 3	64	band 3 => queue 3
65		65
66	Traffic will begin flowing through each queue if your base device has either	66	Traffic will begin flowing through each queue based on either the simple_tx_hash
67	the default simple_tx_hash or a custom netdev->select_queue() defined.	67	function or based on netdev->select_queue() if you have it defined.
68		68
69	The behavior of tc filters remains the same. However a new tc action,	69	The behavior of tc filters remains the same. However a new tc action,
70	skbedit, has been added. Assuming you wanted to route all traffic to a	70	skbedit, has been added. Assuming you wanted to route all traffic to a