Patched in Tegra support.

1 files changed, 3 insertions, 6 deletions

diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index 2a2b096d9a6..edc1950e0e7 100644
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -107,8 +107,7 @@ 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_xmit_stopped(
-                    netdev_get_tx_queue(qdisc_dev(sch), q->curband))) {
+                if (!__netif_subqueue_stopped(qdisc_dev(sch), q->curband)) {
                         qdisc = q->queues[q->curband];
                         skb = qdisc->dequeue(qdisc);
                         if (skb) {
@@ -139,8 +138,7 @@ 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_xmit_stopped(
-                    netdev_get_tx_queue(qdisc_dev(sch), curband))) {
+                if (!__netif_subqueue_stopped(qdisc_dev(sch), curband)) {
                         qdisc = q->queues[curband];
                         skb = qdisc->ops->peek(qdisc);
                         if (skb)
@@ -284,8 +282,7 @@ static int multiq_dump(struct Qdisc *sch, struct sk_buff *skb)
         opt.bands = q->bands;
         opt.max_bands = q->max_bands;
 
-        if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
 
         return skb->len;