Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[cascardo/linux.git] / net / batman-adv / hard-interface.h

diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index d66dabd..3732366 100644 (file)
--- a/net/batman-adv/hard-interface.h
+++ b/net/batman-adv/hard-interface.h
@@ -20,22 +20,22 @@
 #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_
 #define _NET_BATMAN_ADV_HARD_INTERFACE_H_
 
-enum hard_if_state {
-       IF_NOT_IN_USE,
-       IF_TO_BE_REMOVED,
-       IF_INACTIVE,
-       IF_ACTIVE,
-       IF_TO_BE_ACTIVATED,
-       IF_I_WANT_YOU
+enum batadv_hard_if_state {
+       BATADV_IF_NOT_IN_USE,
+       BATADV_IF_TO_BE_REMOVED,
+       BATADV_IF_INACTIVE,
+       BATADV_IF_ACTIVE,
+       BATADV_IF_TO_BE_ACTIVATED,
+       BATADV_IF_I_WANT_YOU,
 };
 
 extern struct notifier_block batadv_hard_if_notifier;
 
-struct hard_iface*
+struct batadv_hard_iface*
 batadv_hardif_get_by_netdev(const struct net_device *net_dev);
-int batadv_hardif_enable_interface(struct hard_iface *hard_iface,
+int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
                                   const char *iface_name);
-void batadv_hardif_disable_interface(struct hard_iface *hard_iface);
+void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface);
 void batadv_hardif_remove_interfaces(void);
 int batadv_hardif_min_mtu(struct net_device *soft_iface);
 void batadv_update_min_mtu(struct net_device *soft_iface);
@@ -43,16 +43,16 @@ void batadv_hardif_free_rcu(struct rcu_head *rcu);
 bool batadv_is_wifi_iface(int ifindex);
 
 static inline void
-batadv_hardif_free_ref(struct hard_iface *hard_iface)
+batadv_hardif_free_ref(struct batadv_hard_iface *hard_iface)
 {
        if (atomic_dec_and_test(&hard_iface->refcount))
                call_rcu(&hard_iface->rcu, batadv_hardif_free_rcu);
 }
 
-static inline struct hard_iface *
-batadv_primary_if_get_selected(struct bat_priv *bat_priv)
+static inline struct batadv_hard_iface *
+batadv_primary_if_get_selected(struct batadv_priv *bat_priv)
 {
-       struct hard_iface *hard_iface;
+       struct batadv_hard_iface *hard_iface;
 
        rcu_read_lock();
        hard_iface = rcu_dereference(bat_priv->primary_if);