net: Add queue state xoff flag for stack

Create separate queue state flags so that either the stack or drivers
can turn on XOFF.  Added a set of functions used in the stack to determine
if a queue is really stopped (either by stack or driver)

Signed-off-by: Tom Herbert <therbert@google.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 2 deletions

diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index edc1950e0e77..49131d7a7446 100644
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -107,7 +107,8 @@ static struct sk_buff *multiq_dequeue(struct Qdisc *sch)
                 /* Check that target subqueue is available before
                  * pulling an skb to avoid head-of-line blocking.
                  */
-                if (!__netif_subqueue_stopped(qdisc_dev(sch), q->curband)) {
+                if (!netif_xmit_stopped(
+                    netdev_get_tx_queue(qdisc_dev(sch), q->curband))) {
                         qdisc = q->queues[q->curband];
                         skb = qdisc->dequeue(qdisc);
                         if (skb) {
@@ -138,7 +139,8 @@ static struct sk_buff *multiq_peek(struct Qdisc *sch)
                 /* Check that target subqueue is available before
                  * pulling an skb to avoid head-of-line blocking.
                  */
-                if (!__netif_subqueue_stopped(qdisc_dev(sch), curband)) {
+                if (!netif_xmit_stopped(
+                    netdev_get_tx_queue(qdisc_dev(sch), curband))) {
                         qdisc = q->queues[curband];
                         skb = qdisc->ops->peek(qdisc);
                         if (skb)