=2D-nextPart3922123.nRKsmd8L0B Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" On Friday 26 December 2014 12:41:17 Markus Pargmann wrote: > Markus Pargmann (26): [...] > batman-adv: packet.h, add some missing includes > batman-adv: types.h, add missing include Just went through the includes and noticed that a lot more are missing (also in the files which you are already touched). I have attached the current state of my analysis so you can compare it with your notes. Kind regards, Sven =2D-nextPart3922123.nRKsmd8L0B Content-Disposition: attachment; filename="0001-batman-adv-Add-required-includes-previously-used-thr.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-batman-adv-Add-required-includes-previously-used-thr.patch" From=20a99b635a3f9dcf745ca6ad00323fa4aa6150c3c1 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sun, 22 Mar 2015 01:03:04 +0100 Subject: [RFCv0] batman-adv: Add required includes previously used through transient includes TODO: * write something about bad transient includes * write about the four include/forward declaration sections Signed-off-by: Sven Eckelmann =2D-- bat_iv_ogm.c | 42 ++++++++++++++++++++++++++++++------ bitarray.c | 4 ++-- bitarray.h | 6 ++++++ bridge_loop_avoidance.c | 39 ++++++++++++++++++++++++++------- bridge_loop_avoidance.h | 10 +++++++++ debugfs.c | 25 +++++++++++++++------- debugfs.h | 7 ++++++ distributed-arp-table.c | 29 ++++++++++++++++++++----- distributed-arp-table.h | 14 +++++++++--- fragmentation.c | 22 ++++++++++++++++--- fragmentation.h | 11 ++++++++++ gateway_client.c | 34 +++++++++++++++++++++++------ gateway_client.h | 10 +++++++++ gateway_common.c | 12 ++++++++++- gateway_common.h | 7 ++++++ hard-interface.c | 38 ++++++++++++++++++++++----------- hard-interface.h | 13 +++++++++++ hash.c | 6 +++++- hash.h | 9 ++++++++ icmp_socket.c | 33 ++++++++++++++++++++++++---- icmp_socket.h | 7 ++++++ main.c | 57 ++++++++++++++++++++++++++++++++++--------------- main.h | 33 ++++++++++++++-------------- multicast.c | 30 +++++++++++++++++++++++--- multicast.h | 6 ++++++ network-coding.c | 38 +++++++++++++++++++++++++++++---- network-coding.h | 13 +++++++++++ originator.c | 28 +++++++++++++++++------- originator.h | 14 ++++++++++++ packet.h | 5 +++++ routing.c | 37 +++++++++++++++++++++++--------- routing.h | 10 +++++++++ send.c | 37 ++++++++++++++++++++++++-------- send.h | 13 +++++++++++ soft-interface.c | 55 ++++++++++++++++++++++++++++++++++------------- soft-interface.h | 11 ++++++++++ sysfs.c | 32 +++++++++++++++++++++------ sysfs.h | 10 +++++++++ translation-table.c | 40 +++++++++++++++++++++++++++------- translation-table.h | 9 ++++++++ types.h | 15 +++++++++++-- 41 files changed, 712 insertions(+), 159 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 04bd220..41c7bd2 100644 =2D-- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -16,15 +16,45 @@ */ #include "main.h" =2D#include "translation-table.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bitarray.h" +#include "hard-interface.h" +#include "hash.h" +#include "network-coding.h" #include "originator.h" +#include "packet.h" #include "routing.h" =2D#include "gateway_common.h" =2D#include "gateway_client.h" =2D#include "hard-interface.h" #include "send.h" =2D#include "bat_algo.h" =2D#include "network-coding.h" +#include "translation-table.h" +#include "types.h" /** * enum batadv_dup_status - duplicate status diff --git a/bitarray.c b/bitarray.c index e3da07a..ea483f5 100644 =2D-- a/bitarray.c +++ b/bitarray.c @@ -15,10 +15,10 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "bitarray.h" +#include "main.h" =2D#include +#include /* shift the packet array by n places. */ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) diff --git a/bitarray.h b/bitarray.h index 2acaafe..0240fc2 100644 =2D-- a/bitarray.h +++ b/bitarray.h @@ -18,6 +18,12 @@ #ifndef _NET_BATMAN_ADV_BITARRAY_H_ #define _NET_BATMAN_ADV_BITARRAY_H_ +#include "main.h" + +#include +#include +#include + /* 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. */ diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 6927589..30ebbdc 100644 =2D-- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -15,19 +15,42 @@ * along with this program; if not, see . */ =2D#include "main.h" =2D#include "hash.h" =2D#include "hard-interface.h" =2D#include "originator.h" #include "bridge_loop_avoidance.h" =2D#include "translation-table.h" =2D#include "send.h" +#include "main.h" =2D#include +#include +#include +#include #include +#include +#include +#include #include =2D#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hard-interface.h" +#include "hash.h" +#include "originator.h" +#include "packet.h" +#include "translation-table.h" +#include "types.h" static const uint8_t batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05}; diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 43c985d..1318805 100644 =2D-- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -18,6 +18,16 @@ #ifndef _NET_BATMAN_ADV_BLA_H_ #define _NET_BATMAN_ADV_BLA_H_ +#include "main.h" + +#include + +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); diff --git a/debugfs.c b/debugfs.c index 9d337b5..9d23aff 100644 =2D-- a/debugfs.c +++ b/debugfs.c @@ -15,21 +15,30 @@ * along with this program; if not, see . */ +#include "debugfs.h" #include "main.h" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include =2D#include "debugfs.h" =2D#include "translation-table.h" =2D#include "originator.h" =2D#include "hard-interface.h" =2D#include "gateway_common.h" =2D#include "gateway_client.h" =2D#include "soft-interface.h" =2D#include "icmp_socket.h" #include "bridge_loop_avoidance.h" #include "distributed-arp-table.h" +#include "gateway_client.h" +#include "icmp_socket.h" #include "network-coding.h" +#include "originator.h" +#include "translation-table.h" +#include "types.h" static struct dentry *batadv_debugfs; diff --git a/debugfs.h b/debugfs.h index 421f092..ce085b8 100644 =2D-- a/debugfs.h +++ b/debugfs.h @@ -18,6 +18,13 @@ #ifndef _NET_BATMAN_ADV_DEBUGFS_H_ #define _NET_BATMAN_ADV_DEBUGFS_H_ +#include "main.h" + +#include + +struct batadv_hard_iface; +struct net_device; + #define BATADV_DEBUGFS_SUBDIR "batman_adv" #if IS_ENABLED(CONFIG_DEBUG_FS) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 107ad62..1339985 100644 =2D-- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -15,19 +15,38 @@ * along with this program; if not, see . */ =2D#include +#include "distributed-arp-table.h" +#include "main.h" + +#include +#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include =2D#include "main.h" =2D#include "hash.h" =2D#include "distributed-arp-table.h" #include "hard-interface.h" +#include "hash.h" #include "originator.h" #include "send.h" =2D#include "types.h" #include "translation-table.h" +#include "types.h" static void batadv_dat_purge(struct work_struct *work); diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 2fe0764..fed3ff2 100644 =2D-- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -18,12 +18,20 @@ #ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ #define _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ =2D#ifdef CONFIG_BATMAN_ADV_DAT +#include "main.h" + +#include +#include +#include =2D#include "types.h" #include "originator.h" +#include "packet.h" +#include "types.h" + +struct seq_file; +struct sk_buff; =2D#include +#ifdef CONFIG_BATMAN_ADV_DAT /* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space */ #define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0) diff --git a/fragmentation.c b/fragmentation.c index 9e06457..124356a 100644 =2D-- a/fragmentation.c +++ b/fragmentation.c @@ -15,12 +15,28 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "fragmentation.h" =2D#include "send.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hard-interface.h" #include "originator.h" +#include "packet.h" #include "routing.h" =2D#include "hard-interface.h" +#include "send.h" #include "soft-interface.h" /** diff --git a/fragmentation.h b/fragmentation.h index d848cf6..446cdee 100644 =2D-- a/fragmentation.h +++ b/fragmentation.h @@ -18,6 +18,17 @@ #ifndef _NET_BATMAN_ADV_FRAGMENTATION_H_ #define _NET_BATMAN_ADV_FRAGMENTATION_H_ +#include "main.h" + +#include +#include +#include +#include + +#include "types.h" + +struct sk_buff; + void batadv_frag_purge_orig(struct batadv_orig_node *orig, bool (*check_cb)(struct batadv_frag_table_entry *)); bool batadv_frag_skb_fwd(struct sk_buff *skb, diff --git a/gateway_client.c b/gateway_client.c index 090828c..9b2ef82 100644 =2D-- a/gateway_client.c +++ b/gateway_client.c @@ -15,18 +15,38 @@ * along with this program; if not, see . */ =2D#include "main.h" =2D#include "sysfs.h" #include "gateway_client.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "gateway_common.h" #include "hard-interface.h" #include "originator.h" =2D#include "translation-table.h" +#include "packet.h" #include "routing.h" =2D#include =2D#include =2D#include =2D#include +#include "sysfs.h" +#include "translation-table.h" /* These are the offsets of the "hw type" and "hw address length" in the dhcp * packet starting at the beginning of the dhcp header diff --git a/gateway_client.h b/gateway_client.h index 7ee53bb..588122b 100644 =2D-- a/gateway_client.h +++ b/gateway_client.h @@ -18,6 +18,16 @@ #ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ #define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ +#include "main.h" + +#include + +#include "types.h" + +struct batadv_tvlv_gateway_data; +struct seq_file; +struct sk_buff; + void batadv_gw_check_client_stop(struct batadv_priv *bat_priv); void batadv_gw_reselect(struct batadv_priv *bat_priv); void batadv_gw_election(struct batadv_priv *bat_priv); diff --git a/gateway_common.c b/gateway_common.c index 6f5e621..636d59c 100644 =2D-- a/gateway_common.c +++ b/gateway_common.c @@ -15,9 +15,19 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "gateway_common.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include + #include "gateway_client.h" +#include "packet.h" +#include "types.h" /** * batadv_parse_gw_bandwidth - parse supplied string buffer to extract download diff --git a/gateway_common.h b/gateway_common.h index aa51165..2020c0f 100644 =2D-- a/gateway_common.h +++ b/gateway_common.h @@ -18,6 +18,13 @@ #ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_ #define _NET_BATMAN_ADV_GATEWAY_COMMON_H_ +#include "main.h" + +#include + +struct batadv_priv; +struct net_device; + enum batadv_gw_modes { BATADV_GW_MODE_OFF, BATADV_GW_MODE_CLIENT, diff --git a/hard-interface.c b/hard-interface.c index fbda6b5..380e025 100644 =2D-- a/hard-interface.c +++ b/hard-interface.c @@ -15,22 +15,36 @@ * along with this program; if not, see . */ =2D#include "main.h" =2D#include "distributed-arp-table.h" #include "hard-interface.h" =2D#include "soft-interface.h" =2D#include "send.h" =2D#include "translation-table.h" =2D#include "routing.h" =2D#include "sysfs.h" =2D#include "debugfs.h" =2D#include "originator.h" =2D#include "hash.h" =2D#include "bridge_loop_avoidance.h" =2D#include "gateway_client.h" +#include "main.h" +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bridge_loop_avoidance.h" +#include "debugfs.h" +#include "distributed-arp-table.h" +#include "gateway_client.h" +#include "originator.h" +#include "packet.h" +#include "send.h" +#include "soft-interface.h" +#include "sysfs.h" +#include "translation-table.h" void batadv_hardif_free_rcu(struct rcu_head *rcu) { diff --git a/hard-interface.h b/hard-interface.h index 1918cd5..004f859 100644 =2D-- a/hard-interface.h +++ b/hard-interface.h @@ -18,6 +18,19 @@ #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_ #define _NET_BATMAN_ADV_HARD_INTERFACE_H_ +#include "main.h" + +#include +#include +#include +#include +#include +#include + +#include "types.h" + +struct net_device; + enum batadv_hard_if_state { BATADV_IF_NOT_IN_USE, BATADV_IF_TO_BE_REMOVED, diff --git a/hash.c b/hash.c index 7c1c630..0532dc9 100644 =2D-- a/hash.c +++ b/hash.c @@ -15,8 +15,12 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "hash.h" +#include "main.h" + +#include +#include +#include /* clears the hash */ static void batadv_hash_init(struct batadv_hashtable *hash) diff --git a/hash.h b/hash.h index a1d0980..b7cc418 100644 =2D-- a/hash.h +++ b/hash.h @@ -18,7 +18,16 @@ #ifndef _NET_BATMAN_ADV_HASH_H_ #define _NET_BATMAN_ADV_HASH_H_ +#include "main.h" + +#include #include +#include +#include +#include +#include + +struct lock_class_key; /* callback to a compare function. should compare 2 element datas for their * keys, return 0 if same and not 0 if not same diff --git a/icmp_socket.c b/icmp_socket.c index 161ef8f..4bab8ab 100644 =2D-- a/icmp_socket.c +++ b/icmp_socket.c @@ -15,14 +15,39 @@ * along with this program; if not, see . */ +#include "icmp_socket.h" #include "main.h" + +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include =2D#include "icmp_socket.h" =2D#include "send.h" =2D#include "hash.h" =2D#include "originator.h" +#include +#include +#include +#include +#include +#include + #include "hard-interface.h" +#include "originator.h" +#include "packet.h" +#include "send.h" +#include "types.h" static struct batadv_socket_client *batadv_socket_client_hash[256]; diff --git a/icmp_socket.h b/icmp_socket.h index 0c33950..0189910 100644 =2D-- a/icmp_socket.h +++ b/icmp_socket.h @@ -18,6 +18,13 @@ #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ #define _NET_BATMAN_ADV_ICMP_SOCKET_H_ +#include "main.h" + +#include + +struct batadv_icmp_header; +struct batadv_priv; + #define BATADV_ICMP_SOCKET "socket" void batadv_socket_init(void); diff --git a/main.c b/main.c index 766ab33..dd159b1 100644 =2D-- a/main.c +++ b/main.c @@ -15,31 +15,54 @@ * along with this program; if not, see . */ +#include "main.h" + +#include +#include +#include #include =2D#include +#include +#include +#include #include =2D#include =2D#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include =2D#include "main.h" =2D#include "sysfs.h" +#include + +#include "bat_algo.h" +#include "bridge_loop_avoidance.h" #include "debugfs.h" +#include "distributed-arp-table.h" +#include "gateway_client.h" +#include "gateway_common.h" +#include "hard-interface.h" +#include "icmp_socket.h" +#include "multicast.h" +#include "network-coding.h" +#include "originator.h" +#include "packet.h" #include "routing.h" #include "send.h" =2D#include "originator.h" #include "soft-interface.h" =2D#include "icmp_socket.h" #include "translation-table.h" =2D#include "hard-interface.h" =2D#include "gateway_client.h" =2D#include "bridge_loop_avoidance.h" =2D#include "distributed-arp-table.h" =2D#include "multicast.h" =2D#include "gateway_common.h" =2D#include "hash.h" =2D#include "bat_algo.h" =2D#include "network-coding.h" =2D#include "fragmentation.h" +#include "types.h" /* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked diff --git a/main.h b/main.h index 569846b..0df62b8 100644 =2D-- a/main.h +++ b/main.h @@ -163,28 +163,27 @@ enum batadv_uev_type { /* Kernel headers */ =2D#include /* mutex */ =2D#include /* needed by all modules */ =2D#include /* netdevice */ =2D#include /* ethernet address classification */ =2D#include /* ethernet header */ =2D#include /* poll_table */ =2D#include /* kernel threads */ =2D#include /* schedule types */ =2D#include /* workqueue */ +#include +#include +#include +#include +#include +#include #include =2D#include =2D#include =2D#include /* struct sock */ =2D#include /* ipv6 address stuff */ =2D#include =2D#include #include =2D#include #include + #include "compat.h" =2D#include "types.h" +struct batadv_algo_ops; +struct batadv_hard_iface; +struct batadv_orig_node; +struct batadv_priv; +struct batadv_ogm_packet; +struct net_device; +struct packet_type; +struct seq_file; +struct sk_buff; #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ (int)(vid & VLAN_VID_MASK) : -1) diff --git a/multicast.c b/multicast.c index b24e4bb..e1b50b5 100644 =2D-- a/multicast.c +++ b/multicast.c @@ -15,11 +15,35 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "multicast.h" =2D#include "originator.h" =2D#include "hard-interface.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "packet.h" #include "translation-table.h" +#include "types.h" /** * batadv_mcast_mla_softif_get - get softif multicast listeners diff --git a/multicast.h b/multicast.h index 3a44ebd..ae04f1e 100644 =2D-- a/multicast.h +++ b/multicast.h @@ -18,6 +18,12 @@ #ifndef _NET_BATMAN_ADV_MULTICAST_H_ #define _NET_BATMAN_ADV_MULTICAST_H_ +#include "main.h" + +struct batadv_orig_node; +struct batadv_priv; +struct sk_buff; + /** * batadv_forw_mode - the way a packet should be forwarded as * @BATADV_FORW_ALL: forward the packet to all nodes (currently via classic diff --git a/network-coding.c b/network-coding.c index d128c3b..f72108b 100644 =2D-- a/network-coding.c +++ b/network-coding.c @@ -15,15 +15,45 @@ * along with this program; if not, see . */ +#include "network-coding.h" +#include "main.h" + +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include =2D#include "main.h" +#include "hard-interface.h" #include "hash.h" =2D#include "network-coding.h" =2D#include "send.h" #include "originator.h" =2D#include "hard-interface.h" +#include "packet.h" #include "routing.h" +#include "send.h" +#include "types.h" static struct lock_class_key batadv_nc_coding_hash_lock_class_key; static struct lock_class_key batadv_nc_decoding_hash_lock_class_key; diff --git a/network-coding.h b/network-coding.h index 358c0d6..4008ec2 100644 =2D-- a/network-coding.h +++ b/network-coding.h @@ -18,6 +18,19 @@ #ifndef _NET_BATMAN_ADV_NETWORK_CODING_H_ #define _NET_BATMAN_ADV_NETWORK_CODING_H_ +#include "main.h" + +#include + +struct batadv_nc_node; +struct batadv_neigh_node; +struct batadv_ogm_packet; +struct batadv_orig_node; +struct batadv_priv; +struct net_device; +struct seq_file; +struct sk_buff; + #ifdef CONFIG_BATMAN_ADV_NC void batadv_nc_status_update(struct net_device *net_dev); diff --git a/originator.c b/originator.c index 9e04e60..684536e 100644 =2D-- a/originator.c +++ b/originator.c @@ -15,19 +15,31 @@ * along with this program; if not, see . */ +#include "originator.h" #include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "distributed-arp-table.h" =2D#include "originator.h" =2D#include "hash.h" =2D#include "translation-table.h" =2D#include "routing.h" +#include "fragmentation.h" #include "gateway_client.h" #include "hard-interface.h" =2D#include "soft-interface.h" =2D#include "bridge_loop_avoidance.h" =2D#include "network-coding.h" =2D#include "fragmentation.h" +#include "hash.h" #include "multicast.h" +#include "network-coding.h" +#include "routing.h" +#include "translation-table.h" /* hash class keys */ static struct lock_class_key batadv_orig_hash_lock_class_key; diff --git a/originator.h b/originator.h index a179c03..a966394 100644 =2D-- a/originator.h +++ b/originator.h @@ -18,7 +18,21 @@ #ifndef _NET_BATMAN_ADV_ORIGINATOR_H_ #define _NET_BATMAN_ADV_ORIGINATOR_H_ +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include + #include "hash.h" +#include "types.h" + +struct seq_file; int batadv_compare_orig(const struct hlist_node *node, const void *data2); int batadv_originator_init(struct batadv_priv *bat_priv); diff --git a/packet.h b/packet.h index b81fbbf..27b4003 100644 =2D-- a/packet.h +++ b/packet.h @@ -18,6 +18,11 @@ #ifndef _NET_BATMAN_ADV_PACKET_H_ #define _NET_BATMAN_ADV_PACKET_H_ +#include +#include +#include +#include + /** * enum batadv_packettype - types for batman-adv encapsulated packets * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV diff --git a/routing.c b/routing.c index da83982..ea6fa6e 100644 =2D-- a/routing.c +++ b/routing.c @@ -15,20 +15,37 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "routing.h" =2D#include "send.h" =2D#include "soft-interface.h" =2D#include "hard-interface.h" =2D#include "icmp_socket.h" =2D#include "translation-table.h" =2D#include "originator.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bitarray.h" #include "bridge_loop_avoidance.h" #include "distributed-arp-table.h" =2D#include "network-coding.h" #include "fragmentation.h" =2D =2D#include +#include "hard-interface.h" +#include "icmp_socket.h" +#include "network-coding.h" +#include "originator.h" +#include "packet.h" +#include "send.h" +#include "soft-interface.h" +#include "translation-table.h" +#include "types.h" static int batadv_route_unicast_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if); diff --git a/routing.h b/routing.h index 557d3d1..f8a9e14 100644 =2D-- a/routing.h +++ b/routing.h @@ -18,6 +18,16 @@ #ifndef _NET_BATMAN_ADV_ROUTING_H_ #define _NET_BATMAN_ADV_ROUTING_H_ +#include "main.h" + +#include + +struct batadv_hard_iface; +struct batadv_neigh_node; +struct batadv_orig_node; +struct batadv_priv; +struct sk_buff; + bool batadv_check_management_packet(struct sk_buff *skb, struct batadv_hard_iface *hard_iface, int header_len); diff --git a/send.c b/send.c index d27161e..27d8ee3 100644 =2D-- a/send.c +++ b/send.c @@ -15,19 +15,38 @@ * along with this program; if not, see . */ +#include "send.h" #include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "distributed-arp-table.h" =2D#include "send.h" =2D#include "routing.h" =2D#include "translation-table.h" =2D#include "soft-interface.h" =2D#include "hard-interface.h" =2D#include "gateway_common.h" +#include "fragmentation.h" #include "gateway_client.h" =2D#include "originator.h" +#include "hard-interface.h" #include "network-coding.h" =2D#include "fragmentation.h" =2D#include "multicast.h" +#include "originator.h" +#include "routing.h" +#include "soft-interface.h" +#include "translation-table.h" +#include "types.h" static void batadv_send_outstanding_bcast_packet(struct work_struct *work); diff --git a/send.h b/send.h index 38d0ec1..de85f2f 100644 =2D-- a/send.h +++ b/send.h @@ -18,6 +18,19 @@ #ifndef _NET_BATMAN_ADV_SEND_H_ #define _NET_BATMAN_ADV_SEND_H_ +#include "main.h" + +#include +#include + +#include "packet.h" + +struct batadv_hard_iface; +struct batadv_orig_node; +struct batadv_priv; +struct sk_buff; +struct work_struct; + int batadv_send_skb_packet(struct sk_buff *skb, struct batadv_hard_iface *hard_iface, const uint8_t *dst_addr); diff --git a/soft-interface.c b/soft-interface.c index 78d63e3..57e621b 100644 =2D-- a/soft-interface.c +++ b/soft-interface.c @@ -15,26 +15,51 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "soft-interface.h" =2D#include "hard-interface.h" =2D#include "distributed-arp-table.h" =2D#include "routing.h" =2D#include "send.h" =2D#include "debugfs.h" =2D#include "translation-table.h" =2D#include "hash.h" =2D#include "gateway_common.h" =2D#include "gateway_client.h" =2D#include "sysfs.h" =2D#include "originator.h" =2D#include =2D#include +#include "main.h" + +#include +#include +#include +#include +#include #include +#include +#include +#include #include =2D#include "multicast.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "bridge_loop_avoidance.h" +#include "debugfs.h" +#include "distributed-arp-table.h" +#include "gateway_client.h" +#include "gateway_common.h" +#include "hard-interface.h" +#include "multicast.h" #include "network-coding.h" +#include "packet.h" +#include "send.h" +#include "sysfs.h" +#include "translation-table.h" +#include "types.h" static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static void batadv_get_drvinfo(struct net_device *dev, diff --git a/soft-interface.h b/soft-interface.h index dbab22f..e1e8bb9 100644 =2D-- a/soft-interface.h +++ b/soft-interface.h @@ -18,6 +18,17 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ +#include "main.h" + +#include + +struct batadv_hard_iface; +struct batadv_orig_node; +struct batadv_priv; +struct batadv_softif_vlan; +struct net_device; +struct sk_buff; + int batadv_skb_head_push(struct sk_buff *skb, unsigned int len); void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct batadv_hard_iface *recv_if, diff --git a/sysfs.c b/sysfs.c index 97a6192..3cb2f13 100644 =2D-- a/sysfs.c +++ b/sysfs.c @@ -15,16 +15,36 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "sysfs.h" =2D#include "translation-table.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "distributed-arp-table.h" =2D#include "network-coding.h" =2D#include "originator.h" +#include "gateway_client.h" +#include "gateway_common.h" #include "hard-interface.h" +#include "network-coding.h" +#include "packet.h" #include "soft-interface.h" =2D#include "gateway_common.h" =2D#include "gateway_client.h" +#include "types.h" static struct net_device *batadv_kobj_to_netdev(struct kobject *obj) { diff --git a/sysfs.h b/sysfs.h index b715b60..bc1f6df 100644 =2D-- a/sysfs.h +++ b/sysfs.h @@ -18,6 +18,16 @@ #ifndef _NET_BATMAN_ADV_SYSFS_H_ #define _NET_BATMAN_ADV_SYSFS_H_ +#include "main.h" + +#include +#include + +struct batadv_priv; +struct batadv_softif_vlan; +struct kobject; +struct net_device; + #define BATADV_SYSFS_IF_MESH_SUBDIR "mesh" #define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv" /** diff --git a/translation-table.c b/translation-table.c index b20812b..74ec17c 100644 =2D-- a/translation-table.c +++ b/translation-table.c @@ -15,18 +15,42 @@ * along with this program; if not, see . */ =2D#include "main.h" #include "translation-table.h" =2D#include "soft-interface.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bridge_loop_avoidance.h" #include "hard-interface.h" =2D#include "send.h" #include "hash.h" =2D#include "originator.h" =2D#include "routing.h" =2D#include "bridge_loop_avoidance.h" #include "multicast.h" =2D =2D#include +#include "originator.h" +#include "packet.h" +#include "soft-interface.h" +#include "types.h" /* hash class keys */ static struct lock_class_key batadv_tt_local_hash_lock_class_key; diff --git a/translation-table.h b/translation-table.h index ad84d7b..3c2b868 100644 =2D-- a/translation-table.h +++ b/translation-table.h @@ -18,6 +18,15 @@ #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ +#include "main.h" + +#include + +struct batadv_orig_node; +struct batadv_priv; +struct net_device; +struct seq_file; + int batadv_tt_init(struct batadv_priv *bat_priv); bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, unsigned short vid, int ifindex, uint32_t mark); diff --git a/types.h b/types.h index b72fa7b..c5f2424 100644 =2D-- a/types.h +++ b/types.h @@ -18,9 +18,20 @@ #ifndef _NET_BATMAN_ADV_TYPES_H_ #define _NET_BATMAN_ADV_TYPES_H_ +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include + #include "packet.h" =2D#include "bitarray.h" =2D#include + +struct seq_file; #ifdef CONFIG_BATMAN_ADV_DAT =2D- 2.1.4 =2D-nextPart3922123.nRKsmd8L0B-- This is a multi-part message in MIME format.