batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
[firefly-linux-kernel-4.4.55.git] / net / batman-adv / main.c
index df7335c4217a60821eec9f788d95d1cdedf52cd2..13c88b25ab319a15260e77d12c65957180c46b9c 100644 (file)
@@ -18,8 +18,8 @@
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
-#include "bat_debugfs.h"
+#include "sysfs.h"
+#include "debugfs.h"
 #include "routing.h"
 #include "send.h"
 #include "originator.h"
@@ -39,7 +39,7 @@
  */
 struct list_head batadv_hardif_list;
 static int (*batadv_rx_handler[256])(struct sk_buff *,
-                                    struct hard_iface *);
+                                    struct batadv_hard_iface *);
 char batadv_routing_algo[20] = "BATMAN_IV";
 static struct hlist_head batadv_algo_list;
 
@@ -92,7 +92,7 @@ static void __exit batadv_exit(void)
 
 int batadv_mesh_init(struct net_device *soft_iface)
 {
-       struct bat_priv *bat_priv = netdev_priv(soft_iface);
+       struct batadv_priv *bat_priv = netdev_priv(soft_iface);
        int ret;
 
        spin_lock_init(&bat_priv->forw_bat_list_lock);
@@ -132,7 +132,7 @@ int batadv_mesh_init(struct net_device *soft_iface)
                goto err;
 
        atomic_set(&bat_priv->gw_reselect, 0);
-       atomic_set(&bat_priv->mesh_state, MESH_ACTIVE);
+       atomic_set(&bat_priv->mesh_state, BATADV_MESH_ACTIVE);
 
        return 0;
 
@@ -143,9 +143,9 @@ err:
 
 void batadv_mesh_free(struct net_device *soft_iface)
 {
-       struct bat_priv *bat_priv = netdev_priv(soft_iface);
+       struct batadv_priv *bat_priv = netdev_priv(soft_iface);
 
-       atomic_set(&bat_priv->mesh_state, MESH_DEACTIVATING);
+       atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING);
 
        batadv_purge_outstanding_packets(bat_priv, NULL);
 
@@ -160,7 +160,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
 
        free_percpu(bat_priv->bat_counters);
 
-       atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
+       atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
 }
 
 void batadv_inc_module_count(void)
@@ -175,11 +175,11 @@ void batadv_dec_module_count(void)
 
 int batadv_is_my_mac(const uint8_t *addr)
 {
-       const struct hard_iface *hard_iface;
+       const struct batadv_hard_iface *hard_iface;
 
        rcu_read_lock();
        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
-               if (hard_iface->if_status != IF_ACTIVE)
+               if (hard_iface->if_status != BATADV_IF_ACTIVE)
                        continue;
 
                if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) {
@@ -192,7 +192,7 @@ int batadv_is_my_mac(const uint8_t *addr)
 }
 
 static int batadv_recv_unhandled_packet(struct sk_buff *skb,
-                                       struct hard_iface *recv_if)
+                                       struct batadv_hard_iface *recv_if)
 {
        return NET_RX_DROP;
 }
@@ -204,13 +204,14 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
                           struct packet_type *ptype,
                           struct net_device *orig_dev)
 {
-       struct bat_priv *bat_priv;
-       struct batman_ogm_packet *batman_ogm_packet;
-       struct hard_iface *hard_iface;
+       struct batadv_priv *bat_priv;
+       struct batadv_ogm_packet *batadv_ogm_packet;
+       struct batadv_hard_iface *hard_iface;
        uint8_t idx;
        int ret;
 
-       hard_iface = container_of(ptype, struct hard_iface, batman_adv_ptype);
+       hard_iface = container_of(ptype, struct batadv_hard_iface,
+                                 batman_adv_ptype);
        skb = skb_share_check(skb, GFP_ATOMIC);
 
        /* skb was released by skb_share_check() */
@@ -230,26 +231,26 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
        bat_priv = netdev_priv(hard_iface->soft_iface);
 
-       if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
+       if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)
                goto err_free;
 
        /* discard frames on not active interfaces */
-       if (hard_iface->if_status != IF_ACTIVE)
+       if (hard_iface->if_status != BATADV_IF_ACTIVE)
                goto err_free;
 
-       batman_ogm_packet = (struct batman_ogm_packet *)skb->data;
+       batadv_ogm_packet = (struct batadv_ogm_packet *)skb->data;
 
-       if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
-               batadv_dbg(DBG_BATMAN, bat_priv,
+       if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
+               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
                           "Drop packet: incompatible batman version (%i)\n",
-                          batman_ogm_packet->header.version);
+                          batadv_ogm_packet->header.version);
                goto err_free;
        }
 
        /* all receive handlers return whether they received or reused
         * the supplied skb. if not, we have to free the skb.
         */
-       idx = batman_ogm_packet->header.packet_type;
+       idx = batadv_ogm_packet->header.packet_type;
        ret = (*batadv_rx_handler[idx])(skb, hard_iface);
 
        if (ret == NET_RX_DROP)
@@ -275,24 +276,25 @@ static void batadv_recv_handler_init(void)
                batadv_rx_handler[i] = batadv_recv_unhandled_packet;
 
        /* batman icmp packet */
-       batadv_rx_handler[BAT_ICMP] = batadv_recv_icmp_packet;
+       batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet;
        /* unicast packet */
-       batadv_rx_handler[BAT_UNICAST] = batadv_recv_unicast_packet;
+       batadv_rx_handler[BATADV_UNICAST] = batadv_recv_unicast_packet;
        /* fragmented unicast packet */
-       batadv_rx_handler[BAT_UNICAST_FRAG] = batadv_recv_ucast_frag_packet;
+       batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_ucast_frag_packet;
        /* broadcast packet */
-       batadv_rx_handler[BAT_BCAST] = batadv_recv_bcast_packet;
+       batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;
        /* vis packet */
-       batadv_rx_handler[BAT_VIS] = batadv_recv_vis_packet;
+       batadv_rx_handler[BATADV_VIS] = batadv_recv_vis_packet;
        /* Translation table query (request or response) */
-       batadv_rx_handler[BAT_TT_QUERY] = batadv_recv_tt_query;
+       batadv_rx_handler[BATADV_TT_QUERY] = batadv_recv_tt_query;
        /* Roaming advertisement */
-       batadv_rx_handler[BAT_ROAM_ADV] = batadv_recv_roam_adv;
+       batadv_rx_handler[BATADV_ROAM_ADV] = batadv_recv_roam_adv;
 }
 
-int batadv_recv_handler_register(uint8_t packet_type,
-                                int (*recv_handler)(struct sk_buff *,
-                                                    struct hard_iface *))
+int
+batadv_recv_handler_register(uint8_t packet_type,
+                            int (*recv_handler)(struct sk_buff *,
+                                                struct batadv_hard_iface *))
 {
        if (batadv_rx_handler[packet_type] != &batadv_recv_unhandled_packet)
                return -EBUSY;
@@ -306,9 +308,9 @@ void batadv_recv_handler_unregister(uint8_t packet_type)
        batadv_rx_handler[packet_type] = batadv_recv_unhandled_packet;
 }
 
-static struct bat_algo_ops *batadv_algo_get(char *name)
+static struct batadv_algo_ops *batadv_algo_get(char *name)
 {
-       struct bat_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp;
+       struct batadv_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp;
        struct hlist_node *node;
 
        hlist_for_each_entry(bat_algo_ops_tmp, node, &batadv_algo_list, list) {
@@ -322,9 +324,9 @@ static struct bat_algo_ops *batadv_algo_get(char *name)
        return bat_algo_ops;
 }
 
-int batadv_algo_register(struct bat_algo_ops *bat_algo_ops)
+int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops)
 {
-       struct bat_algo_ops *bat_algo_ops_tmp;
+       struct batadv_algo_ops *bat_algo_ops_tmp;
        int ret;
 
        bat_algo_ops_tmp = batadv_algo_get(bat_algo_ops->name);
@@ -356,9 +358,9 @@ out:
        return ret;
 }
 
-int batadv_algo_select(struct bat_priv *bat_priv, char *name)
+int batadv_algo_select(struct batadv_priv *bat_priv, char *name)
 {
-       struct bat_algo_ops *bat_algo_ops;
+       struct batadv_algo_ops *bat_algo_ops;
        int ret = -EINVAL;
 
        bat_algo_ops = batadv_algo_get(name);
@@ -374,7 +376,7 @@ out:
 
 int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)
 {
-       struct bat_algo_ops *bat_algo_ops;
+       struct batadv_algo_ops *bat_algo_ops;
        struct hlist_node *node;
 
        seq_printf(seq, "Available routing algorithms:\n");
@@ -388,7 +390,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)
 
 static int batadv_param_set_ra(const char *val, const struct kernel_param *kp)
 {
-       struct bat_algo_ops *bat_algo_ops;
+       struct batadv_algo_ops *bat_algo_ops;
        char *algo_name = (char *)val;
        size_t name_len = strlen(algo_name);