summaryrefslogtreecommitdiff
path: root/net/batman-adv/originator.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-21 16:10:36 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-21 16:10:42 +1100
commit846bb7788aced3ff6bfb5f674899ee5bc783e98e (patch)
treea19c658572beb8963dabe962f626265845b5d6b2 /net/batman-adv/originator.h
parent8cc156311126614ff6a59560e4eb20731156f799 (diff)
parentda691fd2697453e910a4bd0c8daaa80da48a0935 (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'net/batman-adv/originator.h')
-rw-r--r--net/batman-adv/originator.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index 286bf743e76a..7df48fa7669d 100644
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -68,7 +68,6 @@ batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data)
{
struct batadv_hashtable *hash = bat_priv->orig_hash;
struct hlist_head *head;
- struct hlist_node *node;
struct batadv_orig_node *orig_node, *orig_node_tmp = NULL;
int index;
@@ -79,7 +78,7 @@ batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data)
head = &hash->table[index];
rcu_read_lock();
- hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
+ hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
if (!batadv_compare_eth(orig_node, data))
continue;