batman-adv: rename global if_list to hardif_list
Batman-adv works with "hard interfaces" as well as "soft interfaces".
The new name should better make clear which kind of interfaces this
list stores.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index de9bd36..4a2e6e3 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -31,8 +31,8 @@
#include <linux/if_arp.h>
-/* protect update critical side of if_list - but not the content */
-static DEFINE_SPINLOCK(if_list_lock);
+/* protect update critical side of hardif_list - but not the content */
+static DEFINE_SPINLOCK(hardif_list_lock);
static int batman_skb_recv(struct sk_buff *skb,
@@ -54,7 +54,7 @@
struct batman_if *batman_if;
rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
+ list_for_each_entry_rcu(batman_if, &hardif_list, list) {
if (batman_if->net_dev == net_dev &&
atomic_inc_not_zero(&batman_if->refcount))
goto out;
@@ -99,7 +99,7 @@
struct batman_if *batman_if;
rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
+ list_for_each_entry_rcu(batman_if, &hardif_list, list) {
if (batman_if->soft_iface != soft_iface)
continue;
@@ -179,7 +179,7 @@
struct batman_if *batman_if;
rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
+ list_for_each_entry_rcu(batman_if, &hardif_list, list) {
if ((batman_if->if_status != IF_ACTIVE) &&
(batman_if->if_status != IF_TO_BE_ACTIVATED))
continue;
@@ -212,7 +212,7 @@
goto out;
rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
+ list_for_each_entry_rcu(batman_if, &hardif_list, list) {
if ((batman_if->if_status != IF_ACTIVE) &&
(batman_if->if_status != IF_TO_BE_ACTIVATED))
continue;
@@ -449,9 +449,9 @@
check_known_mac_addr(batman_if->net_dev);
- spin_lock(&if_list_lock);
- list_add_tail_rcu(&batman_if->list, &if_list);
- spin_unlock(&if_list_lock);
+ spin_lock(&hardif_list_lock);
+ list_add_tail_rcu(&batman_if->list, &hardif_list);
+ spin_unlock(&hardif_list_lock);
return batman_if;
@@ -484,12 +484,12 @@
INIT_LIST_HEAD(&if_queue);
- spin_lock(&if_list_lock);
- list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list, list) {
+ spin_lock(&hardif_list_lock);
+ list_for_each_entry_safe(batman_if, batman_if_tmp, &hardif_list, list) {
list_del_rcu(&batman_if->list);
list_add_tail(&batman_if->list, &if_queue);
}
- spin_unlock(&if_list_lock);
+ spin_unlock(&hardif_list_lock);
rtnl_lock();
list_for_each_entry_safe(batman_if, batman_if_tmp, &if_queue, list) {
@@ -520,9 +520,9 @@
hardif_deactivate_interface(batman_if);
break;
case NETDEV_UNREGISTER:
- spin_lock(&if_list_lock);
+ spin_lock(&hardif_list_lock);
list_del_rcu(&batman_if->list);
- spin_unlock(&if_list_lock);
+ spin_unlock(&hardif_list_lock);
hardif_remove_interface(batman_if);
break;