[PATCH]: Fix tbf_reset

[PATCH]: Fix tbf_reset

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

This patch fixes TBF purging an unused queue in tbf_reset instead
of resetting q.qlen. I haven't checked the history, but it looks
like this place was forgotten when making TBF classful.

Best regards,
Patrick


[-- Attachment #2: 02-tbf_reset.diff --]
[-- Type: text/plain, Size: 939 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1428  -> 1.1429 
#	 net/sched/sch_tbf.c	1.11    -> 1.12   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/11/12	kaber@trash.net	1.1429
# Reset q.qlen in tbf_reset instead of purging an unused queue
# --------------------------------------------
#
diff -Nru a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
--- a/net/sched/sch_tbf.c	Thu Nov 13 14:57:27 2003
+++ b/net/sched/sch_tbf.c	Thu Nov 13 14:57:27 2003
@@ -268,7 +268,7 @@
 	struct tbf_sched_data *q = (struct tbf_sched_data *)sch->data;
 
 	qdisc_reset(q->qdisc);
-	skb_queue_purge(&sch->q);
+	sch->q.qlen = 0;
 	sch->stats.backlog = 0;
 	PSCHED_GET_TIME(q->t_c);
 	q->tokens = q->buffer;

Re: [PATCH]: Fix tbf_reset

[David S. Miller]

On Thu, 13 Nov 2003 15:47:44 +0100
Patrick McHardy <kaber@trash.net> wrote:

> This patch fixes TBF purging an unused queue in tbf_reset instead
> of resetting q.qlen. I haven't checked the history, but it looks
> like this place was forgotten when making TBF classful.

Yes, the bug was introduced when adding inner-qdisc attaching
support to TBF.

Thanks for tracking this down Patrick, patch applied.