diff options
Diffstat (limited to 'net/sched/sch_drr.c')
-rw-r--r-- | net/sched/sch_drr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c index 71e50c80315f..759b308d1a8d 100644 --- a/net/sched/sch_drr.c +++ b/net/sched/sch_drr.c | |||
@@ -293,14 +293,13 @@ static void drr_walk(struct Qdisc *sch, struct qdisc_walker *arg) | |||
293 | { | 293 | { |
294 | struct drr_sched *q = qdisc_priv(sch); | 294 | struct drr_sched *q = qdisc_priv(sch); |
295 | struct drr_class *cl; | 295 | struct drr_class *cl; |
296 | struct hlist_node *n; | ||
297 | unsigned int i; | 296 | unsigned int i; |
298 | 297 | ||
299 | if (arg->stop) | 298 | if (arg->stop) |
300 | return; | 299 | return; |
301 | 300 | ||
302 | for (i = 0; i < q->clhash.hashsize; i++) { | 301 | for (i = 0; i < q->clhash.hashsize; i++) { |
303 | hlist_for_each_entry(cl, n, &q->clhash.hash[i], common.hnode) { | 302 | hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) { |
304 | if (arg->count < arg->skip) { | 303 | if (arg->count < arg->skip) { |
305 | arg->count++; | 304 | arg->count++; |
306 | continue; | 305 | continue; |
@@ -451,11 +450,10 @@ static void drr_reset_qdisc(struct Qdisc *sch) | |||
451 | { | 450 | { |
452 | struct drr_sched *q = qdisc_priv(sch); | 451 | struct drr_sched *q = qdisc_priv(sch); |
453 | struct drr_class *cl; | 452 | struct drr_class *cl; |
454 | struct hlist_node *n; | ||
455 | unsigned int i; | 453 | unsigned int i; |
456 | 454 | ||
457 | for (i = 0; i < q->clhash.hashsize; i++) { | 455 | for (i = 0; i < q->clhash.hashsize; i++) { |
458 | hlist_for_each_entry(cl, n, &q->clhash.hash[i], common.hnode) { | 456 | hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) { |
459 | if (cl->qdisc->q.qlen) | 457 | if (cl->qdisc->q.qlen) |
460 | list_del(&cl->alist); | 458 | list_del(&cl->alist); |
461 | qdisc_reset(cl->qdisc); | 459 | qdisc_reset(cl->qdisc); |
@@ -468,13 +466,13 @@ static void drr_destroy_qdisc(struct Qdisc *sch) | |||
468 | { | 466 | { |
469 | struct drr_sched *q = qdisc_priv(sch); | 467 | struct drr_sched *q = qdisc_priv(sch); |
470 | struct drr_class *cl; | 468 | struct drr_class *cl; |
471 | struct hlist_node *n, *next; | 469 | struct hlist_node *next; |
472 | unsigned int i; | 470 | unsigned int i; |
473 | 471 | ||
474 | tcf_destroy_chain(&q->filter_list); | 472 | tcf_destroy_chain(&q->filter_list); |
475 | 473 | ||
476 | for (i = 0; i < q->clhash.hashsize; i++) { | 474 | for (i = 0; i < q->clhash.hashsize; i++) { |
477 | hlist_for_each_entry_safe(cl, n, next, &q->clhash.hash[i], | 475 | hlist_for_each_entry_safe(cl, next, &q->clhash.hash[i], |
478 | common.hnode) | 476 | common.hnode) |
479 | drr_destroy_class(sch, cl); | 477 | drr_destroy_class(sch, cl); |
480 | } | 478 | } |