hlist: drop the node parameter from iterators

[cascardo/linux.git] / net / sched / sch_qfq.c

diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 6ed3765..e9a77f6 100644 (file)
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -276,9 +276,8 @@ static struct qfq_aggregate *qfq_find_agg(struct qfq_sched *q,
                                          u32 lmax, u32 weight)
 {
        struct qfq_aggregate *agg;
-       struct hlist_node *n;
 
-       hlist_for_each_entry(agg, n, &q->nonfull_aggs, nonfull_next)
+       hlist_for_each_entry(agg, &q->nonfull_aggs, nonfull_next)
                if (agg->lmax == lmax && agg->class_weight == weight)
                        return agg;
 
@@ -670,14 +669,13 @@ static void qfq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
 {
        struct qfq_sched *q = qdisc_priv(sch);
        struct qfq_class *cl;
-       struct hlist_node *n;
        unsigned int i;
 
        if (arg->stop)
                return;
 
        for (i = 0; i < q->clhash.hashsize; i++) {
-               hlist_for_each_entry(cl, n, &q->clhash.hash[i], common.hnode) {
+               hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
                        if (arg->count < arg->skip) {
                                arg->count++;
                                continue;
@@ -1376,11 +1374,10 @@ static unsigned int qfq_drop_from_slot(struct qfq_sched *q,
                                       struct hlist_head *slot)
 {
        struct qfq_aggregate *agg;
-       struct hlist_node *n;
        struct qfq_class *cl;
        unsigned int len;
 
-       hlist_for_each_entry(agg, n, slot, next) {
+       hlist_for_each_entry(agg, slot, next) {
                list_for_each_entry(cl, &agg->active, alist) {
 
                        if (!cl->qdisc->ops->drop)
@@ -1459,11 +1456,10 @@ static void qfq_reset_qdisc(struct Qdisc *sch)
 {
        struct qfq_sched *q = qdisc_priv(sch);
        struct qfq_class *cl;
-       struct hlist_node *n;
        unsigned int i;
 
        for (i = 0; i < q->clhash.hashsize; i++) {
-               hlist_for_each_entry(cl, n, &q->clhash.hash[i], common.hnode) {
+               hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
                        if (cl->qdisc->q.qlen > 0)
                                qfq_deactivate_class(q, cl);
 
@@ -1477,13 +1473,13 @@ static void qfq_destroy_qdisc(struct Qdisc *sch)
 {
        struct qfq_sched *q = qdisc_priv(sch);
        struct qfq_class *cl;
-       struct hlist_node *n, *next;
+       struct hlist_node *next;
        unsigned int i;
 
        tcf_destroy_chain(&q->filter_list);
 
        for (i = 0; i < q->clhash.hashsize; i++) {
-               hlist_for_each_entry_safe(cl, n, next, &q->clhash.hash[i],
+               hlist_for_each_entry_safe(cl, next, &q->clhash.hash[i],
                                          common.hnode) {
                        qfq_destroy_class(sch, cl);
                }