Here are some fixes proposals suggested by Patrick McHardy.
[NET_SCHED] sch_cbq:
- deactivating of active classes when grafting
- purging of queue/q.qlen adjustment when deleting an active class
- deactivating of active classes when q.qlen drops to zero in ->drop()
- a redundant instruction removed from cbq_deactivate_class (my own
suggestion)
PS: - purging of queue and deactivating of active classes
when attaching a new child - not done (according to man, CBQ can carry
packets in any type of nodes).
Signed-off-by: Jarek Poplawski <[EMAIL PROTECTED]>
---
diff -Nurp linux-2.6.19-rc6-/net/sched/sch_cbq.c
linux-2.6.19-rc6/net/sched/sch_cbq.c
--- linux-2.6.19-rc6-/net/sched/sch_cbq.c 2006-09-20 05:42:06.000000000
+0200
+++ linux-2.6.19-rc6/net/sched/sch_cbq.c 2006-11-26 15:10:56.000000000
+0100
@@ -371,8 +371,6 @@ static void cbq_deactivate_class(struct
return;
}
}
-
- cl = cl_prev->next_alive;
return;
}
} while ((cl_prev = cl) != q->active[prio]);
@@ -1258,6 +1256,8 @@ static unsigned int cbq_drop(struct Qdis
do {
if (cl->q->ops->drop && (len =
cl->q->ops->drop(cl->q))) {
sch->q.qlen--;
+ if (!cl->q->q.qlen)
+ cbq_deactivate_class(cl);
return len;
}
} while ((cl = cl->next_alive) != cl_head);
@@ -1683,8 +1683,10 @@ static int cbq_graft(struct Qdisc *sch,
#endif
}
sch_tree_lock(sch);
- *old = cl->q;
- cl->q = new;
+ if (cl->next_alive)
+ cbq_deactivate_class(cl);
+
+ *old = xchg(&cl->q, new);
sch->q.qlen -= (*old)->q.qlen;
qdisc_reset(*old);
sch_tree_unlock(sch);
@@ -1992,6 +1994,9 @@ static int cbq_delete(struct Qdisc *sch,
sch_tree_lock(sch);
+ sch->q.qlen -= cl->q->q.qlen;
+ qdisc_reset(cl->q);
+
if (cl->next_alive)
cbq_deactivate_class(cl);
-
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
