]> err.no Git - linux-2.6/commit
[NET_SCHED]: act_api: qdisc internal reclassify support
authorPatrick McHardy <kaber@trash.net>
Sun, 15 Jul 2007 07:02:31 +0000 (00:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Jul 2007 07:02:31 +0000 (00:02 -0700)
commit73ca4918fbb98311421259d82ef4ab44feeace43
treea5ae62e5474b3d28d7205ab3170aa73ff6d5f8ac
parentf6853e2df3de82c1dac8f62ddcf3a8dfa302419e
[NET_SCHED]: act_api: qdisc internal reclassify support

The behaviour of NET_CLS_POLICE for TC_POLICE_RECLASSIFY was to return
it to the qdisc, which could handle it internally or ignore it. With
NET_CLS_ACT however, tc_classify starts over at the first classifier
and never returns it to the qdisc. This makes it impossible to support
qdisc-internal reclassification, which in turn makes it impossible to
remove the old NET_CLS_POLICE code without breaking compatibility since
we have two qdiscs (CBQ and ATM) that support this.

This patch adds a tc_classify_compat function that handles
reclassification the old way and changes CBQ and ATM to use it.

This again is of course not fully backwards compatible with the previous
NET_CLS_ACT behaviour. Unfortunately there is no way to fully maintain
compatibility *and* support qdisc internal reclassification with
NET_CLS_ACT, but this seems like the better choice over keeping the two
incompatible options around forever.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/pkt_sched.h
include/net/sch_generic.h
net/sched/sch_api.c
net/sched/sch_atm.c
net/sched/sch_cbq.c
net/sched/sch_tbf.c