Merge branch 'linus' into x86/tracehook

Conflicts:
	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 4 deletions

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 537223642b6e..2c35c678563b 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -305,10 +305,11 @@ restart:
 
                 switch (teql_resolve(skb, skb_res, slave)) {
                 case 0:
-                        if (netif_tx_trylock(slave)) {
-                                if (!__netif_subqueue_stopped(slave, subq) &&
+                        if (__netif_tx_trylock(slave_txq)) {
+                                if (!netif_tx_queue_stopped(slave_txq) &&
+                                    !netif_tx_queue_frozen(slave_txq) &&
                                     slave->hard_start_xmit(skb, slave) == 0) {
-                                        netif_tx_unlock(slave);
+                                        __netif_tx_unlock(slave_txq);
                                         master->slaves = NEXT_SLAVE(q);
                                         netif_wake_queue(dev);
                                         master->stats.tx_packets++;
@@ -316,7 +317,7 @@ restart:
                                                 qdisc_pkt_len(skb);
                                         return 0;
                                 }
-                                netif_tx_unlock(slave);
+                                __netif_tx_unlock(slave_txq);
                         }
                         if (netif_queue_stopped(dev))
                                 busy = 1;