sch_htb: let skb->priority refer to non-leaf class
authorHarry Mason <harry.mason@smoothwall.net>
Fri, 17 Jan 2014 13:22:32 +0000 (13:22 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Jan 2014 01:39:48 +0000 (17:39 -0800)
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>
net/sched/sch_htb.c

Simple merge