batman-adv: Prefix main non-static functions with batadv_

batman-adv can be compiled as part of the kernel instead of an module. In that
case the linker will see all non-static symbols of batman-adv and all other
non-static symbols of the kernel. This could lead to symbol collisions. A
prefix for the batman-adv symbols that defines their private namespace avoids
such a problem.

Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 29 insertions, 28 deletions

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index ffea3609ea41..5e1d906628f5 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -38,20 +38,20 @@
 
 /* List manipulations on hardif_list have to be rtnl_lock()'ed,
  * list traversals just rcu-locked */
-struct list_head hardif_list;
+struct list_head batadv_hardif_list;
 static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *);
-char bat_routing_algo[20] = "BATMAN_IV";
+char batadv_routing_algo[20] = "BATMAN_IV";
 static struct hlist_head bat_algo_list;
 
-unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-struct workqueue_struct *bat_event_workqueue;
+struct workqueue_struct *batadv_event_workqueue;
 
 static void recv_handler_init(void);
 
 static int __init batman_init(void)
 {
-        INIT_LIST_HEAD(&hardif_list);
+        INIT_LIST_HEAD(&batadv_hardif_list);
         INIT_HLIST_HEAD(&bat_algo_list);
 
         recv_handler_init();
@@ -60,9 +60,9 @@ static int __init batman_init(void)
 
         /* the name should not be longer than 10 chars - see
          * http://lwn.net/Articles/23634/ */
-        bat_event_workqueue = create_singlethread_workqueue("bat_events");
+        batadv_event_workqueue = create_singlethread_workqueue("bat_events");
 
-        if (!bat_event_workqueue)
+        if (!batadv_event_workqueue)
                 return -ENOMEM;
 
         batadv_socket_init();
@@ -82,14 +82,14 @@ static void __exit batman_exit(void)
         unregister_netdevice_notifier(&batadv_hard_if_notifier);
         batadv_hardif_remove_interfaces();
 
-        flush_workqueue(bat_event_workqueue);
-        destroy_workqueue(bat_event_workqueue);
-        bat_event_workqueue = NULL;
+        flush_workqueue(batadv_event_workqueue);
+        destroy_workqueue(batadv_event_workqueue);
+        batadv_event_workqueue = NULL;
 
         rcu_barrier();
 }
 
-int mesh_init(struct net_device *soft_iface)
+int batadv_mesh_init(struct net_device *soft_iface)
 {
         struct bat_priv *bat_priv = netdev_priv(soft_iface);
         int ret;
@@ -135,11 +135,11 @@ int mesh_init(struct net_device *soft_iface)
         return 0;
 
 err:
-        mesh_free(soft_iface);
+        batadv_mesh_free(soft_iface);
         return ret;
 }
 
-void mesh_free(struct net_device *soft_iface)
+void batadv_mesh_free(struct net_device *soft_iface)
 {
         struct bat_priv *bat_priv = netdev_priv(soft_iface);
 
@@ -161,22 +161,22 @@ void mesh_free(struct net_device *soft_iface)
         atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
 }
 
-void inc_module_count(void)
+void batadv_inc_module_count(void)
 {
         try_module_get(THIS_MODULE);
 }
 
-void dec_module_count(void)
+void batadv_dec_module_count(void)
 {
         module_put(THIS_MODULE);
 }
 
-int is_my_mac(const uint8_t *addr)
+int batadv_is_my_mac(const uint8_t *addr)
 {
         const struct hard_iface *hard_iface;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
                 if (hard_iface->if_status != IF_ACTIVE)
                         continue;
 
@@ -198,8 +198,9 @@ static int recv_unhandled_packet(struct sk_buff *skb,
 /* incoming packets with the batman ethertype received on any active hard
  * interface
  */
-int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
-                    struct packet_type *ptype, struct net_device *orig_dev)
+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;
@@ -287,9 +288,9 @@ static void recv_handler_init(void)
         recv_packet_handler[BAT_ROAM_ADV] = batadv_recv_roam_adv;
 }
 
-int 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 hard_iface *))
 {
         if (recv_packet_handler[packet_type] != &recv_unhandled_packet)
                 return -EBUSY;
@@ -298,7 +299,7 @@ int recv_handler_register(uint8_t packet_type,
         return 0;
 }
 
-void recv_handler_unregister(uint8_t packet_type)
+void batadv_recv_handler_unregister(uint8_t packet_type)
 {
         recv_packet_handler[packet_type] = recv_unhandled_packet;
 }
@@ -319,7 +320,7 @@ static struct bat_algo_ops *bat_algo_get(char *name)
         return bat_algo_ops;
 }
 
-int bat_algo_register(struct bat_algo_ops *bat_algo_ops)
+int batadv_algo_register(struct bat_algo_ops *bat_algo_ops)
 {
         struct bat_algo_ops *bat_algo_ops_tmp;
         int ret;
@@ -353,7 +354,7 @@ out:
         return ret;
 }
 
-int bat_algo_select(struct bat_priv *bat_priv, char *name)
+int batadv_algo_select(struct bat_priv *bat_priv, char *name)
 {
         struct bat_algo_ops *bat_algo_ops;
         int ret = -EINVAL;
@@ -369,7 +370,7 @@ out:
         return ret;
 }
 
-int bat_algo_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)
 {
         struct bat_algo_ops *bat_algo_ops;
         struct hlist_node *node;
@@ -407,8 +408,8 @@ static const struct kernel_param_ops param_ops_ra = {
 };
 
 static struct kparam_string __param_string_ra = {
-        .maxlen = sizeof(bat_routing_algo),
-        .string = bat_routing_algo,
+        .maxlen = sizeof(batadv_routing_algo),
+        .string = batadv_routing_algo,
 };
 
 module_param_cb(routing_algo, &param_ops_ra, &__param_string_ra, 0644);