hlist: drop the node parameter from iterators

[~andy/linux] / net / netfilter / nfnetlink_queue_core.c

diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c
index 3158d87b56a816112ad71bb675d61a5e8c07305b..858fd52c10408393a901a9afb686226638f32f07 100644 (file)
--- a/net/netfilter/nfnetlink_queue_core.c
+++ b/net/netfilter/nfnetlink_queue_core.c
@@ -80,11 +80,10 @@ static struct nfqnl_instance *
 instance_lookup(u_int16_t queue_num)
 {
        struct hlist_head *head;
-       struct hlist_node *pos;
        struct nfqnl_instance *inst;
 
        head = &instance_table[instance_hashfn(queue_num)];
-       hlist_for_each_entry_rcu(inst, pos, head, hlist) {
+       hlist_for_each_entry_rcu(inst, head, hlist) {
                if (inst->queue_num == queue_num)
                        return inst;
        }
@@ -583,11 +582,10 @@ nfqnl_dev_drop(int ifindex)
        rcu_read_lock();
 
        for (i = 0; i < INSTANCE_BUCKETS; i++) {
-               struct hlist_node *tmp;
                struct nfqnl_instance *inst;
                struct hlist_head *head = &instance_table[i];
 
-               hlist_for_each_entry_rcu(inst, tmp, head, hlist)
+               hlist_for_each_entry_rcu(inst, head, hlist)
                        nfqnl_flush(inst, dev_cmp, ifindex);
        }
 
@@ -627,11 +625,11 @@ nfqnl_rcv_nl_event(struct notifier_block *this,
                /* destroy all instances for this portid */
                spin_lock(&instances_lock);
                for (i = 0; i < INSTANCE_BUCKETS; i++) {
-                       struct hlist_node *tmp, *t2;
+                       struct hlist_node *t2;
                        struct nfqnl_instance *inst;
                        struct hlist_head *head = &instance_table[i];
 
-                       hlist_for_each_entry_safe(inst, tmp, t2, head, hlist) {
+                       hlist_for_each_entry_safe(inst, t2, head, hlist) {
                                if ((n->net == &init_net) &&
                                    (n->portid == inst->peer_portid))
                                        __instance_destroy(inst);