Skip to contentSkip to conversation

: Fix tbf_reset

PATCH In review Patrick McHardy 2 participants 2 messages Nov 13, 2003 – Nov 19, 2003

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Fix tbf_reset

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

# 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 [email protected] 1.1429
# Reset q.qlen in tbf_reset instead of purging an unused queue
# --------------------------------------------
#

net/sched/sch_tbf.c +1 -1
diff -Nru a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
@@ -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;
#1 lore raw
Quoted 3 lines · On Thu, 13 Nov 2003 15:47:44 +0100 Patrick McHardy <[email protected]> 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.