These patches fix an off-by-one in netem, clean up pkt_sched.h by removing most of the now unnecessary PSCHED time macros and turning the two remaining ones into inline functions, consolidate some common filter destruction code and move the TCQ_F_THROTTLED optimization from netem to qdisc_restart.
Please apply, thanks. include/net/pkt_sched.h | 24 +++++++------- include/net/red.h | 10 +++--- include/net/sch_generic.h | 10 +----- net/sched/act_police.c | 17 ++++------ net/sched/sch_api.c | 20 ++++++++++-- net/sched/sch_atm.c | 17 +--------- net/sched/sch_cbq.c | 76 ++++++++++++++++++---------------------------- net/sched/sch_dsmark.c | 8 ---- net/sched/sch_generic.c | 4 ++ net/sched/sch_hfsc.c | 23 +++---------- net/sched/sch_htb.c | 24 ++++---------- net/sched/sch_ingress.c | 7 ---- net/sched/sch_netem.c | 24 +++++--------- net/sched/sch_prio.c | 7 ---- net/sched/sch_tbf.c | 9 ++--- 15 files changed, 110 insertions(+), 170 deletions(-) Patrick McHardy (11): [NET_SCHED]: sch_netem: fix off-by-one in send time comparison [NET_SCHED]: kill PSCHED_AUDIT_TDIFF [NET_SCHED]: kill PSCHED_TADD/PSCHED_TADD2 [NET_SCHED]: kill PSCHED_TLESS [NET_SCHED]: kill PSCHED_SET_PASTPERFECT/PSCHED_IS_PASTPERFECT [NET_SCHED]: kill PSCHED_TDIFF [NET_SCHED]: turn PSCHED_TDIFF_SAFE into inline function [NET_SCHED]: turn PSCHED_GET_TIME into inline function [NET_SCHED]: Unline tcf_destroy [NET_SCHED]: qdisc: remove unnecessary memory barriers [NET_SCHED]: qdisc: avoid dequeue while throttled - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html