The following commit has been merged in the master branch: commit a2d0816608df1ca69fcdbb9135a2b6df0c65d954 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 Signed-off-by: Simon Wunderlich sw@simonwunderlich.de
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index 8c7e761..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,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_ */ 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/icmp_socket.h b/net/batman-adv/bat_iv_ogm.h similarity index 62% copy from net/batman-adv/icmp_socket.h copy to net/batman-adv/bat_iv_ogm.h index 618d5de..b9f3550 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/bat_iv_ogm.h @@ -1,6 +1,6 @@ /* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * - * Marek Lindner + * 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,20 +15,11 @@ * along with this program; if not, see http://www.gnu.org/licenses/. */
-#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ -#define _NET_BATMAN_ADV_ICMP_SOCKET_H_ +#ifndef _BATMAN_ADV_BATADV_IV_OGM_H_ +#define _BATMAN_ADV_BATADV_IV_OGM_H_
#include "main.h"
-#include <linux/types.h> +int batadv_iv_init(void);
-struct batadv_icmp_header; - -#define BATADV_ICMP_SOCKET "socket" - -void batadv_socket_init(void); -int batadv_socket_setup(struct batadv_priv *bat_priv); -void batadv_socket_receive_packet(struct batadv_icmp_header *icmph, - size_t icmp_len); - -#endif /* _NET_BATMAN_ADV_ICMP_SOCKET_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 c2fea81..7231440 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/atomic.h> @@ -31,6 +31,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 72% copy from net/batman-adv/bat_algo.h copy to net/batman-adv/bat_v.h index 8c7e761..83b7763 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); @@ -63,4 +49,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/hard-interface.c b/net/batman-adv/hard-interface.c index ad2c37c..70841c1 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -37,7 +37,7 @@ #include <linux/spinlock.h> #include <linux/workqueue.h>
-#include "bat_algo.h" +#include "bat_v.h" #include "bridge_loop_avoidance.h" #include "debugfs.h" #include "distributed-arp-table.h" diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 05e559c..eab9d1b 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 a5b53a3..5833ab3 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 53458d6..48ce788 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"