patch-2.4.3 linux/net/sched/sch_cbq.c

Next file: linux/net/sched/sch_dsmark.c
Previous file: linux/net/sched/cls_tcindex.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.2/linux/net/sched/sch_cbq.c linux/net/sched/sch_cbq.c
@@ -506,7 +506,7 @@
 			}
 		}
 
-		q->wd_expires = delay;
+		q->wd_expires = base_delay;
 	}
 }
 
@@ -1740,9 +1740,13 @@
 	}
 
 	for (h = 0; h < 16; h++) {
-		for (cl = q->classes[h]; cl; cl = cl->next)
+		struct cbq_class *next;
+
+		for (cl = q->classes[h]; cl; cl = next) {
+			next = cl->next;
 			if (cl != &q->link)
 				cbq_destroy_class(cl);
+		}
 	}
 
 	qdisc_put_rtab(q->link.R_tab);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)