4 files changed, 11 insertions, 18 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 18d8b5acc343..a06a7a58dd11 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -658,11 +658,10 @@ __setup("netdev=", netdev_boot_setup);
 
 struct net_device *__dev_get_by_name(struct net *net, const char *name)
 {
-        struct hlist_node *p;
         struct net_device *dev;
         struct hlist_head *head = dev_name_hash(net, name);
 
-        hlist_for_each_entry(dev, p, head, name_hlist)
+        hlist_for_each_entry(dev, head, name_hlist)
                 if (!strncmp(dev->name, name, IFNAMSIZ))
                         return dev;
 
@@ -684,11 +683,10 @@ EXPORT_SYMBOL(__dev_get_by_name);
 
 struct net_device *dev_get_by_name_rcu(struct net *net, const char *name)
 {
-        struct hlist_node *p;
         struct net_device *dev;
         struct hlist_head *head = dev_name_hash(net, name);
 
-        hlist_for_each_entry_rcu(dev, p, head, name_hlist)
+        hlist_for_each_entry_rcu(dev, head, name_hlist)
                 if (!strncmp(dev->name, name, IFNAMSIZ))
                         return dev;
 
@@ -735,11 +733,10 @@ EXPORT_SYMBOL(dev_get_by_name);
 
 struct net_device *__dev_get_by_index(struct net *net, int ifindex)
 {
-        struct hlist_node *p;
         struct net_device *dev;
         struct hlist_head *head = dev_index_hash(net, ifindex);
 
-        hlist_for_each_entry(dev, p, head, index_hlist)
+        hlist_for_each_entry(dev, head, index_hlist)
                 if (dev->ifindex == ifindex)
                         return dev;
 
@@ -760,11 +757,10 @@ EXPORT_SYMBOL(__dev_get_by_index);
 
 struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
 {
-        struct hlist_node *p;
         struct net_device *dev;
         struct hlist_head *head = dev_index_hash(net, ifindex);
 
-        hlist_for_each_entry_rcu(dev, p, head, index_hlist)
+        hlist_for_each_entry_rcu(dev, head, index_hlist)
                 if (dev->ifindex == ifindex)
                         return dev;
 
diff --git a/net/core/flow.c b/net/core/flow.c
index 43f7495df27a..c56ea6f7f6c7 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -132,14 +132,14 @@ static void __flow_cache_shrink(struct flow_cache *fc,
                                 int shrink_to)
 {
         struct flow_cache_entry *fle;
-        struct hlist_node *entry, *tmp;
+        struct hlist_node *tmp;
         LIST_HEAD(gc_list);
         int i, deleted = 0;
 
         for (i = 0; i < flow_cache_hash_size(fc); i++) {
                 int saved = 0;
 
-                hlist_for_each_entry_safe(fle, entry, tmp,
+                hlist_for_each_entry_safe(fle, tmp,
                                           &fcp->hash_table[i], u.hlist) {
                         if (saved < shrink_to &&
                             flow_entry_valid(fle)) {
@@ -211,7 +211,6 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
         struct flow_cache *fc = &flow_cache_global;
         struct flow_cache_percpu *fcp;
         struct flow_cache_entry *fle, *tfle;
-        struct hlist_node *entry;
         struct flow_cache_object *flo;
         size_t keysize;
         unsigned int hash;
@@ -235,7 +234,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
                 flow_new_hash_rnd(fc, fcp);
 
         hash = flow_hash_code(fc, fcp, key, keysize);
-        hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) {
+        hlist_for_each_entry(tfle, &fcp->hash_table[hash], u.hlist) {
                 if (tfle->net == net &&
                     tfle->family == family &&
                     tfle->dir == dir &&
@@ -301,13 +300,13 @@ static void flow_cache_flush_tasklet(unsigned long data)
         struct flow_cache *fc = info->cache;
         struct flow_cache_percpu *fcp;
         struct flow_cache_entry *fle;
-        struct hlist_node *entry, *tmp;
+        struct hlist_node *tmp;
         LIST_HEAD(gc_list);
         int i, deleted = 0;
 
         fcp = this_cpu_ptr(fc->percpu);
         for (i = 0; i < flow_cache_hash_size(fc); i++) {
-                hlist_for_each_entry_safe(fle, entry, tmp,
+                hlist_for_each_entry_safe(fle, tmp,
                                           &fcp->hash_table[i], u.hlist) {
                         if (flow_entry_valid(fle))
                                 continue;
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 0f6bb6f8d391..3174f1998ee6 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -16,12 +16,11 @@ static inline struct net_device *dev_from_same_bucket(struct seq_file *seq, loff
 {
         struct net *net = seq_file_net(seq);
         struct net_device *dev;
-        struct hlist_node *p;
         struct hlist_head *h;
         unsigned int count = 0, offset = get_offset(*pos);
 
         h = &net->dev_name_head[get_bucket(*pos)];
-        hlist_for_each_entry_rcu(dev, p, h, name_hlist) {
+        hlist_for_each_entry_rcu(dev, h, name_hlist) {
                 if (++count == offset)
                         return dev;
         }
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index d8aa20f6a46e..b376410ff259 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1060,7 +1060,6 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         int idx = 0, s_idx;
         struct net_device *dev;
         struct hlist_head *head;
-        struct hlist_node *node;
         struct nlattr *tb[IFLA_MAX+1];
         u32 ext_filter_mask = 0;
 
@@ -1080,7 +1079,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
                 idx = 0;
                 head = &net->dev_index_head[h];
-                hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+                hlist_for_each_entry_rcu(dev, head, index_hlist) {
                         if (idx < s_idx)
                                 goto cont;
                         if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,