diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 11:23:57 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 11:23:57 +0100 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /net/sched/sch_prio.c | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/sched/sch_prio.c')
| -rw-r--r-- | net/sched/sch_prio.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 2d8c08493d6e..4a49db65772e 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) |