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, 3 insertions, 3 deletions

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index a3b7120fcc74..283bfe3de59d 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -301,7 +301,7 @@ restart:
 
                 if (slave_txq->qdisc_sleeping != q)
                         continue;
-                if (__netif_subqueue_stopped(slave, subq) ||
+                if (netif_xmit_stopped(netdev_get_tx_queue(slave, subq)) ||
                     !netif_running(slave)) {
                         busy = 1;
                         continue;
@@ -312,7 +312,7 @@ restart:
                         if (__netif_tx_trylock(slave_txq)) {
                                 unsigned int length = qdisc_pkt_len(skb);
 
-                                if (!netif_tx_queue_frozen_or_stopped(slave_txq) &&
+                                if (!netif_xmit_frozen_or_stopped(slave_txq) &&
                                     slave_ops->ndo_start_xmit(skb, slave) == NETDEV_TX_OK) {
                                         txq_trans_update(slave_txq);
                                         __netif_tx_unlock(slave_txq);
@@ -324,7 +324,7 @@ restart:
                                 }
                                 __netif_tx_unlock(slave_txq);
                         }
-                        if (netif_queue_stopped(dev))
+                        if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)))
                                 busy = 1;
                         break;
                 case 1: