Commit 1e2c2a4f authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Add required includes to all files 



The header files could not be build indepdent from each other. This is
happened because headers didn't include the files for things they've used.
This was problematic because the success of a build depended on the
knowledge about the right order of local includes.

Also source files were not including everything they've used explicitly.
Instead they required that transitive includes are always stable. This is
problematic because some transitive includes are not obvious, depend on
config settings and may not be stable in the future.

The order for include blocks are:

 * primary headers (main.h and the *.h file of a *.c file)
 * global linux headers
 * required local headers
 * extra forward declarations for pointers in function/struct declarations

The only exceptions are linux/bitops.h and linux/if_ether.h in packet.h.
This header file is shared with userspace applications like batctl and must
therefore build together with userspace applications. The header
linux/bitops.h is not part of the uapi headers and linux/if_ether.h
conflicts with the musl implementation of netinet/if_ether.h. The
maintainers rejected the use of __KERNEL__ preprocessor checks and thus
these two headers are only in main.h. All files using packet.h first have
to include main.h to work correctly.

Reported-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
parent bcef1f3c

net/batman-adv/bat_iv_ogm.c

+36 −6
Original line number Diff line number Diff line
@@ -15,16 +15,46 @@ 
 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#include "bat_algo.h"

#include "main.h"

#include "translation-table.h"



#include <linux/atomic.h>

#include <linux/bitmap.h>

#include <linux/bitops.h>

#include <linux/bug.h>

#include <linux/byteorder/generic.h>

#include <linux/cache.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>

#include <linux/fs.h>

#include <linux/if_ether.h>

#include <linux/init.h>

#include <linux/jiffies.h>

#include <linux/list.h>

#include <linux/netdevice.h>

#include <linux/pkt_sched.h>

#include <linux/printk.h>

#include <linux/random.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/stddef.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/workqueue.h>



#include "bitarray.h"

#include "hard-interface.h"

#include "hash.h"

#include "network-coding.h"

#include "originator.h"

#include "packet.h"

#include "routing.h"

#include "gateway_common.h"

#include "gateway_client.h"

#include "hard-interface.h"

#include "send.h"

#include "bat_algo.h"

#include "network-coding.h"

#include "translation-table.h"



/**

 * enum batadv_dup_status - duplicate status

net/batman-adv/bitarray.c

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#include "main.h"

#include "bitarray.h"

#include "main.h"



#include <linux/bitops.h>

#include <linux/bitmap.h>



/* shift the packet array by n places. */

static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n)

net/batman-adv/bitarray.h

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ 
#ifndef _NET_BATMAN_ADV_BITARRAY_H_

#define _NET_BATMAN_ADV_BITARRAY_H_



#include "main.h"



#include <linux/bitops.h>

#include <linux/compiler.h>

#include <linux/types.h>



/* Returns 1 if the corresponding bit in the given seq_bits indicates true

 * and curr_seqno is within range of last_seqno. Otherwise returns 0.

 */

net/batman-adv/bridge_loop_avoidance.c

+30 −8
Original line number Diff line number Diff line
@@ -15,19 +15,41 @@ 
 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#include "main.h"

#include "hash.h"

#include "hard-interface.h"

#include "originator.h"

#include "bridge_loop_avoidance.h"

#include "translation-table.h"

#include "send.h"

#include "main.h"



#include <linux/etherdevice.h>

#include <linux/atomic.h>

#include <linux/byteorder/generic.h>

#include <linux/compiler.h>

#include <linux/crc16.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>

#include <linux/fs.h>

#include <linux/if_arp.h>

#include <net/arp.h>

#include <linux/if_ether.h>

#include <linux/if_vlan.h>

#include <linux/jhash.h>

#include <linux/jiffies.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/lockdep.h>

#include <linux/netdevice.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/stddef.h>

#include <linux/string.h>

#include <linux/workqueue.h>

#include <net/arp.h>



#include "hard-interface.h"

#include "hash.h"

#include "originator.h"

#include "packet.h"

#include "translation-table.h"



static const uint8_t batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};

net/batman-adv/bridge_loop_avoidance.h

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,16 @@ 
#ifndef _NET_BATMAN_ADV_BLA_H_

#define _NET_BATMAN_ADV_BLA_H_



#include "main.h"



#include <linux/types.h>



struct batadv_hard_iface;

struct batadv_orig_node;

struct batadv_priv;

struct seq_file;

struct sk_buff;



#ifdef CONFIG_BATMAN_ADV_BLA

int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,

		  unsigned short vid, bool is_bcast);

CRA Git | Maintained and supported by SUSTech CRA and CCSE