Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d08166 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

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: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent ba412080

net/batman-adv/bat_algo.h

+0 −31
Original line number Diff line number Diff line
@@ -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_ */

net/batman-adv/bat_iv_ogm.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

net/batman-adv/bat_iv_ogm.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* Copyright (C) 2007-2016  B.A.T.M.A.N. contributors:

 *

 * 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

 * License as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef _BATMAN_ADV_BATADV_IV_OGM_H_

#define _BATMAN_ADV_BATADV_IV_OGM_H_



#include "main.h"



int batadv_iv_init(void);



#endif /* _BATMAN_ADV_BATADV_IV_OGM_H_ */

net/batman-adv/bat_v.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

net/batman-adv/bat_v.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/* Copyright (C) 2011-2016  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Linus Lüssing

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef _NET_BATMAN_ADV_BAT_V_H_

#define _NET_BATMAN_ADV_BAT_V_H_



#include "main.h"



#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_V_H_ */