2 files changed, 6 insertions, 8 deletions

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 2f544dac72df..311361e1272c 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -109,11 +109,9 @@ clusterip_config_entry_put(struct clusterip_config *c)
 static struct clusterip_config *
 __clusterip_config_find(__be32 clusterip)
 {
-        struct list_head *pos;
+        struct clusterip_config *c;
 
-        list_for_each(pos, &clusterip_configs) {
-                struct clusterip_config *c = list_entry(pos,
-                                        struct clusterip_config, list);
+        list_for_each_entry(c, &clusterip_configs, list) {
                 if (c->clusterip == clusterip)
                         return c;
         }
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 631d26948314..e6d3a69b9e9b 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -62,17 +62,17 @@ static DEFINE_MUTEX(nf_hook_mutex);
 
 int nf_register_hook(struct nf_hook_ops *reg)
 {
-        struct list_head *i;
+        struct nf_hook_ops *elem;
         int err;
 
         err = mutex_lock_interruptible(&nf_hook_mutex);
         if (err < 0)
                 return err;
-        list_for_each(i, &nf_hooks[reg->pf][reg->hooknum]) {
-                if (reg->priority < ((struct nf_hook_ops *)i)->priority)
+        list_for_each_entry(elem, &nf_hooks[reg->pf][reg->hooknum], list) {
+                if (reg->priority < elem->priority)
                         break;
         }
-        list_add_rcu(&reg->list, i->prev);
+        list_add_rcu(&reg->list, elem->list.prev);
         mutex_unlock(&nf_hook_mutex);
         return 0;
 }