From 4efa54a70b90e6523db64390a1352c3bf0ebb95d Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 5 Jul 2008 23:23:27 -0700 Subject: [PATCH] --- yaml --- r: 103313 b: refs/heads/master c: aee18a8cf28808b7302ef698d77fa73883e60f1b h: refs/heads/master i: 103311: a797481025f02ceddc311025d1a6a3d20766b2bb v: v3 --- [refs] | 2 +- trunk/net/sched/sch_htb.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 750755fcbbe1..8446e236822d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4207759939c208f24d7e09596753e67b6bc188f9 +refs/heads/master: aee18a8cf28808b7302ef698d77fa73883e60f1b diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c index 128a5ab2e376..ee8b4ffe110c 100644 --- a/trunk/net/sched/sch_htb.c +++ b/trunk/net/sched/sch_htb.c @@ -159,7 +159,6 @@ struct htb_sched { /* filters for qdisc itself */ struct tcf_proto *filter_list; - int filter_cnt; int rate2quantum; /* quant = rate / rate2quantum */ psched_time_t now; /* cached dequeue time */ @@ -1484,7 +1483,6 @@ static struct tcf_proto **htb_find_tcf(struct Qdisc *sch, unsigned long arg) static unsigned long htb_bind_filter(struct Qdisc *sch, unsigned long parent, u32 classid) { - struct htb_sched *q = qdisc_priv(sch); struct htb_class *cl = htb_find(classid, sch); /*if (cl && !cl->level) return 0; @@ -1498,20 +1496,15 @@ static unsigned long htb_bind_filter(struct Qdisc *sch, unsigned long parent, */ if (cl) cl->filter_cnt++; - else - q->filter_cnt++; return (unsigned long)cl; } static void htb_unbind_filter(struct Qdisc *sch, unsigned long arg) { - struct htb_sched *q = qdisc_priv(sch); struct htb_class *cl = (struct htb_class *)arg; if (cl) cl->filter_cnt--; - else - q->filter_cnt--; } static void htb_walk(struct Qdisc *sch, struct qdisc_walker *arg)