summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/bat_algo.h
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2016-05-15 11:07:46 +0200
committerSimon Wunderlich <sw@simonwunderlich.de>2016-06-30 10:29:43 +0200
commita2d0816608df1ca69fcdbb9135a2b6df0c65d954 (patch)
tree0e6738d99c27d59fa4e7b1d6dfa47b782c4addf8 /net/batman-adv/bat_algo.h
parentba412080fb6461b5a40dbc5e44186ed029d67b8d (diff)
downloadlinux-stable-a2d0816608df1ca69fcdbb9135a2b6df0c65d954.tar.gz
linux-stable-a2d0816608df1ca69fcdbb9135a2b6df0c65d954.tar.bz2
linux-stable-a2d0816608df1ca69fcdbb9135a2b6df0c65d954.zip
batman-adv: Fix bat_(iv|v) function declaration header
The bat_algo.h had some functions declared which were not part of the bat_algo.c file. These are instead stored in bat_v.c and bat_iv_ogm.c. The declaration should therefore be also in bat_v.h and bat_iv_ogm,h to make them easier to find. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/bat_algo.h')
-rw-r--r--net/batman-adv/bat_algo.h31
1 files changed, 0 insertions, 31 deletions
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
index 8c7e761ff23b..860d773dd8fa 100644
--- a/net/batman-adv/bat_algo.h
+++ b/net/batman-adv/bat_algo.h
@@ -24,8 +24,6 @@
struct seq_file;
-int batadv_iv_init(void);
-
extern char batadv_routing_algo[];
extern struct list_head batadv_hardif_list;
@@ -34,33 +32,4 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);
int batadv_algo_select(struct batadv_priv *bat_priv, char *name);
int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);
-#ifdef CONFIG_BATMAN_ADV_BATMAN_V
-
-int batadv_v_init(void);
-void batadv_v_hardif_init(struct batadv_hard_iface *hardif);
-int batadv_v_mesh_init(struct batadv_priv *bat_priv);
-void batadv_v_mesh_free(struct batadv_priv *bat_priv);
-
-#else
-
-static inline int batadv_v_init(void)
-{
- return 0;
-}
-
-static inline void batadv_v_hardif_init(struct batadv_hard_iface *hardif)
-{
-}
-
-static inline int batadv_v_mesh_init(struct batadv_priv *bat_priv)
-{
- return 0;
-}
-
-static inline void batadv_v_mesh_free(struct batadv_priv *bat_priv)
-{
-}
-
-#endif /* CONFIG_BATMAN_ADV_BATMAN_V */
-
#endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */