diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-11-23 10:42:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-28 10:47:18 -0800 |
| commit | 5a0d2268d259886f0c87131639d19eb4a67b4532 (patch) | |
| tree | 952e6225fcee027f3a4ae8e1c2b2c889eff3a8b2 /net/sched/sch_teql.c | |
| parent | d3c15cab213becc49a6f2ad7f48a59513a5f17dd (diff) | |
| download | kernel_goldelico_gta04-5a0d2268d259886f0c87131639d19eb4a67b4532.zip kernel_goldelico_gta04-5a0d2268d259886f0c87131639d19eb4a67b4532.tar.gz kernel_goldelico_gta04-5a0d2268d259886f0c87131639d19eb4a67b4532.tar.bz2 | |
net: add netif_tx_queue_frozen_or_stopped
When testing struct netdev_queue state against FROZEN bit, we also test
XOFF bit. We can test both bits at once and save some cycles.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_teql.c')
| -rw-r--r-- | net/sched/sch_teql.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 401af95..106479a 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -309,8 +309,7 @@ restart: if (__netif_tx_trylock(slave_txq)) { unsigned int length = qdisc_pkt_len(skb); - if (!netif_tx_queue_stopped(slave_txq) && - !netif_tx_queue_frozen(slave_txq) && + if (!netif_tx_queue_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); |