diff options
Diffstat (limited to 'net/sched/sch_hfsc.c')
-rw-r--r-- | net/sched/sch_hfsc.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 6c2ec4510540..9facea03faeb 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -1389,7 +1389,6 @@ static void | |||
1389 | hfsc_walk(struct Qdisc *sch, struct qdisc_walker *arg) | 1389 | hfsc_walk(struct Qdisc *sch, struct qdisc_walker *arg) |
1390 | { | 1390 | { |
1391 | struct hfsc_sched *q = qdisc_priv(sch); | 1391 | struct hfsc_sched *q = qdisc_priv(sch); |
1392 | struct hlist_node *n; | ||
1393 | struct hfsc_class *cl; | 1392 | struct hfsc_class *cl; |
1394 | unsigned int i; | 1393 | unsigned int i; |
1395 | 1394 | ||
@@ -1397,7 +1396,7 @@ hfsc_walk(struct Qdisc *sch, struct qdisc_walker *arg) | |||
1397 | return; | 1396 | return; |
1398 | 1397 | ||
1399 | for (i = 0; i < q->clhash.hashsize; i++) { | 1398 | for (i = 0; i < q->clhash.hashsize; i++) { |
1400 | hlist_for_each_entry(cl, n, &q->clhash.hash[i], | 1399 | hlist_for_each_entry(cl, &q->clhash.hash[i], |
1401 | cl_common.hnode) { | 1400 | cl_common.hnode) { |
1402 | if (arg->count < arg->skip) { | 1401 | if (arg->count < arg->skip) { |
1403 | arg->count++; | 1402 | arg->count++; |
@@ -1523,11 +1522,10 @@ hfsc_reset_qdisc(struct Qdisc *sch) | |||
1523 | { | 1522 | { |
1524 | struct hfsc_sched *q = qdisc_priv(sch); | 1523 | struct hfsc_sched *q = qdisc_priv(sch); |
1525 | struct hfsc_class *cl; | 1524 | struct hfsc_class *cl; |
1526 | struct hlist_node *n; | ||
1527 | unsigned int i; | 1525 | unsigned int i; |
1528 | 1526 | ||
1529 | for (i = 0; i < q->clhash.hashsize; i++) { | 1527 | for (i = 0; i < q->clhash.hashsize; i++) { |
1530 | hlist_for_each_entry(cl, n, &q->clhash.hash[i], cl_common.hnode) | 1528 | hlist_for_each_entry(cl, &q->clhash.hash[i], cl_common.hnode) |
1531 | hfsc_reset_class(cl); | 1529 | hfsc_reset_class(cl); |
1532 | } | 1530 | } |
1533 | q->eligible = RB_ROOT; | 1531 | q->eligible = RB_ROOT; |
@@ -1540,16 +1538,16 @@ static void | |||
1540 | hfsc_destroy_qdisc(struct Qdisc *sch) | 1538 | hfsc_destroy_qdisc(struct Qdisc *sch) |
1541 | { | 1539 | { |
1542 | struct hfsc_sched *q = qdisc_priv(sch); | 1540 | struct hfsc_sched *q = qdisc_priv(sch); |
1543 | struct hlist_node *n, *next; | 1541 | struct hlist_node *next; |
1544 | struct hfsc_class *cl; | 1542 | struct hfsc_class *cl; |
1545 | unsigned int i; | 1543 | unsigned int i; |
1546 | 1544 | ||
1547 | for (i = 0; i < q->clhash.hashsize; i++) { | 1545 | for (i = 0; i < q->clhash.hashsize; i++) { |
1548 | hlist_for_each_entry(cl, n, &q->clhash.hash[i], cl_common.hnode) | 1546 | hlist_for_each_entry(cl, &q->clhash.hash[i], cl_common.hnode) |
1549 | tcf_destroy_chain(&cl->filter_list); | 1547 | tcf_destroy_chain(&cl->filter_list); |
1550 | } | 1548 | } |
1551 | for (i = 0; i < q->clhash.hashsize; i++) { | 1549 | for (i = 0; i < q->clhash.hashsize; i++) { |
1552 | hlist_for_each_entry_safe(cl, n, next, &q->clhash.hash[i], | 1550 | hlist_for_each_entry_safe(cl, next, &q->clhash.hash[i], |
1553 | cl_common.hnode) | 1551 | cl_common.hnode) |
1554 | hfsc_destroy_class(sch, cl); | 1552 | hfsc_destroy_class(sch, cl); |
1555 | } | 1553 | } |
@@ -1564,12 +1562,11 @@ hfsc_dump_qdisc(struct Qdisc *sch, struct sk_buff *skb) | |||
1564 | unsigned char *b = skb_tail_pointer(skb); | 1562 | unsigned char *b = skb_tail_pointer(skb); |
1565 | struct tc_hfsc_qopt qopt; | 1563 | struct tc_hfsc_qopt qopt; |
1566 | struct hfsc_class *cl; | 1564 | struct hfsc_class *cl; |
1567 | struct hlist_node *n; | ||
1568 | unsigned int i; | 1565 | unsigned int i; |
1569 | 1566 | ||
1570 | sch->qstats.backlog = 0; | 1567 | sch->qstats.backlog = 0; |
1571 | for (i = 0; i < q->clhash.hashsize; i++) { | 1568 | for (i = 0; i < q->clhash.hashsize; i++) { |
1572 | hlist_for_each_entry(cl, n, &q->clhash.hash[i], cl_common.hnode) | 1569 | hlist_for_each_entry(cl, &q->clhash.hash[i], cl_common.hnode) |
1573 | sch->qstats.backlog += cl->qdisc->qstats.backlog; | 1570 | sch->qstats.backlog += cl->qdisc->qstats.backlog; |
1574 | } | 1571 | } |
1575 | 1572 | ||