3 files changed, 20 insertions, 13 deletions

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 13c09bc32a..dee0d5fb39 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -380,6 +380,10 @@ void qdisc_tree_decrease_qlen(struct Qdisc *sch, unsigned int n)
                 return;
         while ((parentid = sch->parent)) {
                 sch = qdisc_lookup(sch->dev, TC_H_MAJ(parentid));
+                if (sch == NULL) {
+                        WARN_ON(parentid != TC_H_ROOT);
+                        return;
+                }
                 cops = sch->ops->cl_ops;
                 if (cops->qlen_notify) {
                         cl = cops->get(sch, parentid);
@@ -420,8 +424,6 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
                         unsigned long cl = cops->get(parent, classid);
                         if (cl) {
                                 err = cops->graft(parent, cl, new, old);
-                                if (new)
-                                        new->parent = classid;
                                 cops->put(parent, cl);
                         }
                 }
@@ -436,7 +438,8 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
  */
 
 static struct Qdisc *
-qdisc_create(struct net_device *dev, u32 handle, struct rtattr **tca, int *errp)
+qdisc_create(struct net_device *dev, u32 parent, u32 handle,
+           struct rtattr **tca, int *errp)
 {
         int err;
         struct rtattr *kind = tca[TCA_KIND-1];
@@ -482,6 +485,8 @@ qdisc_create(struct net_device *dev, u32 handle, struct rtattr **tca, int *errp)
                 goto err_out2;
         }
 
+        sch->parent = parent;
+
         if (handle == TC_H_INGRESS) {
                 sch->flags |= TCQ_F_INGRESS;
                 sch->stats_lock = &dev->ingress_lock;
@@ -758,9 +763,11 @@ create_n_graft:
         if (!(n->nlmsg_flags&NLM_F_CREATE))
                 return -ENOENT;
         if (clid == TC_H_INGRESS)
-                q = qdisc_create(dev, tcm->tcm_parent, tca, &err);
+                q = qdisc_create(dev, tcm->tcm_parent, tcm->tcm_parent,
+                                 tca, &err);
         else
-                q = qdisc_create(dev, tcm->tcm_handle, tca, &err);
+                q = qdisc_create(dev, tcm->tcm_parent, tcm->tcm_handle,
+                                 tca, &err);
         if (q == NULL) {
                 if (err == -EAGAIN)
                         goto replay;
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 51f16b0af1..2d32fd2749 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -158,9 +158,8 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                         break;
                 case TC_ACT_RECLASSIFY:
                 case TC_ACT_OK:
-                case TC_ACT_UNSPEC:
-                default:
                         skb->tc_index = TC_H_MIN(res.classid);
+                default:
                         result = TC_ACT_OK;
                         break;
         }
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 2d8c08493d..4a49db6577 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -38,9 +38,11 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
         struct prio_sched_data *q = qdisc_priv(sch);
         u32 band = skb->priority;
         struct tcf_result res;
+        int err;
 
         *qerr = NET_XMIT_BYPASS;
         if (TC_H_MAJ(skb->priority) != sch->handle) {
+                err = tc_classify(skb, q->filter_list, &res);
 #ifdef CONFIG_NET_CLS_ACT
                 switch (tc_classify(skb, q->filter_list, &res)) {
                 case TC_ACT_STOLEN:
@@ -49,11 +51,8 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
                 case TC_ACT_SHOT:
                         return NULL;
                 }
-
-                if (!q->filter_list ) {
-#else
-                if (!q->filter_list || tc_classify(skb, q->filter_list, &res)) {
 #endif
+                if (!q->filter_list || err < 0) {
                         if (TC_H_MAJ(band))
                                 band = 0;
                         band = q->prio2band[band&TC_PRIO_MAX];
@@ -239,11 +238,13 @@ static int prio_tune(struct Qdisc *sch, struct rtattr *opt)
         /* If we're multiqueue, make sure the number of incoming bands
          * matches the number of queues on the device we're associating with.
          * If the number of bands requested is zero, then set q->bands to
-         * dev->egress_subqueue_count.
+         * dev->egress_subqueue_count.  Also, the root qdisc must be the
+         * only one that is enabled for multiqueue, since it's the only one
+         * that interacts with the underlying device.
          */
         q->mq = RTA_GET_FLAG(tb[TCA_PRIO_MQ - 1]);
         if (q->mq) {
-                if (sch->handle != TC_H_ROOT)
+                if (sch->parent != TC_H_ROOT)
                         return -EINVAL;
                 if (netif_is_multiqueue(sch->dev)) {
                         if (q->bands == 0)