diff options
| author | Harry Mason <harry.mason@smoothwall.net> | 2014-01-17 13:22:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-22 17:39:48 -0800 |
| commit | 29824310ce3e320726a45475a38fd0c3f0eaad60 (patch) | |
| tree | 4c60d34ed4d40f7626c34ad7a935b544a4801d71 /net/sched/sch_htb.c | |
| parent | 2d36097d26b5991d71a2cf4a20c1a158f0f1bfcd (diff) | |
| download | blackbird-op-linux-29824310ce3e320726a45475a38fd0c3f0eaad60.tar.gz blackbird-op-linux-29824310ce3e320726a45475a38fd0c3f0eaad60.zip | |
sch_htb: let skb->priority refer to non-leaf class
If the class in skb->priority is not a leaf, apply filters from the
selected class, not the qdisc. This lets netfilter or user space
partially classify the packet.
Signed-off-by: Harry Mason <harry.mason@smoothwall.net>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 0db5a6eae87f..722e137df244 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -219,11 +219,16 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, if (skb->priority == sch->handle) return HTB_DIRECT; /* X:0 (direct flow) selected */ cl = htb_find(skb->priority, sch); - if (cl && cl->level == 0) - return cl; + if (cl) { + if (cl->level == 0) + return cl; + /* Start with inner filter chain if a non-leaf class is selected */ + tcf = cl->filter_list; + } else { + tcf = q->filter_list; + } *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; - tcf = q->filter_list; while (tcf && (result = tc_classify(skb, tcf, &res)) >= 0) { #ifdef CONFIG_NET_CLS_ACT switch (result) { |
