Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
commit 1373a7e0e612be4300f90e3a3accacef60a25e9d Author: Sven Eckelmann sven@narfation.org Date: Sun May 15 11:07:46 2016 +0200
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
1373a7e0e612be4300f90e3a3accacef60a25e9d net/batman-adv/bat_algo.h | 26 -------------------------- net/batman-adv/bat_iv_ogm.c | 3 ++- net/batman-adv/{netlink.h => bat_iv_ogm.h} | 13 ++++++------- net/batman-adv/bat_v.c | 3 ++- net/batman-adv/{bat_algo.h => bat_v.h} | 20 +++----------------- net/batman-adv/main.c | 2 ++ net/batman-adv/routing.c | 1 - net/batman-adv/translation-table.c | 1 - 8 files changed, 15 insertions(+), 54 deletions(-)
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index e178206..860d773 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,28 +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); -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 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_ */ diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 805532a..e2d8848 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -15,7 +15,7 @@ * along with this program; if not, see http://www.gnu.org/licenses/. */
-#include "bat_algo.h" +#include "bat_iv_ogm.h" #include "main.h"
#include <linux/atomic.h> @@ -49,6 +49,7 @@ #include <linux/types.h> #include <linux/workqueue.h>
+#include "bat_algo.h" #include "bitarray.h" #include "hard-interface.h" #include "hash.h" diff --git a/net/batman-adv/netlink.h b/net/batman-adv/bat_iv_ogm.h similarity index 70% copy from net/batman-adv/netlink.h copy to net/batman-adv/bat_iv_ogm.h index 39044cc..b9f3550 100644 --- a/net/batman-adv/netlink.h +++ b/net/batman-adv/bat_iv_ogm.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * - * Matthias Schiffer + * Marek Lindner, Simon Wunderlich * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -15,12 +15,11 @@ * along with this program; if not, see http://www.gnu.org/licenses/. */
-#ifndef _NET_BATMAN_ADV_NETLINK_H_ -#define _NET_BATMAN_ADV_NETLINK_H_ +#ifndef _BATMAN_ADV_BATADV_IV_OGM_H_ +#define _BATMAN_ADV_BATADV_IV_OGM_H_
#include "main.h"
-void batadv_netlink_register(void); -void batadv_netlink_unregister(void); +int batadv_iv_init(void);
-#endif /* _NET_BATMAN_ADV_NETLINK_H_ */ +#endif /* _BATMAN_ADV_BATADV_IV_OGM_H_ */ diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index b9c2850..e4a91cd 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -15,7 +15,7 @@ * along with this program; if not, see http://www.gnu.org/licenses/. */
-#include "bat_algo.h" +#include "bat_v.h" #include "main.h"
#include <linux/bug.h> @@ -30,6 +30,7 @@ #include <linux/types.h> #include <linux/workqueue.h>
+#include "bat_algo.h" #include "bat_v_elp.h" #include "bat_v_ogm.h" #include "hard-interface.h" diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_v.h similarity index 69% copy from net/batman-adv/bat_algo.h copy to net/batman-adv/bat_v.h index e178206..52dd6cf 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_v.h @@ -15,25 +15,11 @@ * along with this program; if not, see http://www.gnu.org/licenses/. */
-#ifndef _NET_BATMAN_ADV_BAT_ALGO_H_ -#define _NET_BATMAN_ADV_BAT_ALGO_H_ +#ifndef _NET_BATMAN_ADV_BAT_V_H_ +#define _NET_BATMAN_ADV_BAT_V_H_
#include "main.h"
-#include <linux/types.h> - -struct seq_file; - -int batadv_iv_init(void); - -extern char batadv_routing_algo[]; -extern struct list_head batadv_hardif_list; - -void batadv_algo_init(void); -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); @@ -58,4 +44,4 @@ 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_ */ +#endif /* _NET_BATMAN_ADV_BAT_V_H_ */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 919dd03..275604b 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -46,6 +46,8 @@ #include <net/rtnetlink.h>
#include "bat_algo.h" +#include "bat_iv_ogm.h" +#include "bat_v.h" #include "bridge_loop_avoidance.h" #include "debugfs.h" #include "distributed-arp-table.h" diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index d1a6bad..49f464d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -34,7 +34,6 @@ #include <linux/spinlock.h> #include <linux/stddef.h>
-#include "bat_algo.h" #include "bitarray.h" #include "bridge_loop_avoidance.h" #include "distributed-arp-table.h" diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index ae5811f..9be4ff0 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -44,7 +44,6 @@ #include <linux/string.h> #include <linux/workqueue.h>
-#include "bat_algo.h" #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h"