The following commit has been merged in the master branch: commit 424864fb1a48c237782290f618cfad35e51199af Author: Linus Lüssing linus.luessing@ascom.ch Date: Sun Feb 6 23:08:37 2011 +0000

batman-adv: Remove duplicate types.h inclusions

types.h is included by main.h, which is included at the beginning of any other c-file anyway. Therefore this commit removes those duplicate inclussions.

Signed-off-by: Linus Lüssing linus.luessing@ascom.ch Acked-by: Sven Eckelmann sven@narfation.org

diff --git a/icmp_socket.c b/icmp_socket.c index 10a969c..fc812e1 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -24,7 +24,6 @@ #include <linux/slab.h> #include "icmp_socket.h" #include "send.h" -#include "types.h" #include "hash.h" #include "originator.h" #include "hard-interface.h" diff --git a/icmp_socket.h b/icmp_socket.h index 08b1859..462b190 100644 --- a/icmp_socket.h +++ b/icmp_socket.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ #define _NET_BATMAN_ADV_ICMP_SOCKET_H_

-#include "types.h" - #define ICMP_SOCKET "socket"

void bat_socket_init(void); diff --git a/main.c b/main.c index e687e7f..658ad5a 100644 --- a/main.c +++ b/main.c @@ -30,7 +30,6 @@ #include "translation-table.h" #include "hard-interface.h" #include "gateway_client.h" -#include "types.h" #include "vis.h" #include "hash.h"

diff --git a/routing.c b/routing.c index 2861f18..b792df4 100644 --- a/routing.c +++ b/routing.c @@ -28,7 +28,6 @@ #include "icmp_socket.h" #include "translation-table.h" #include "originator.h" -#include "types.h" #include "ring_buffer.h" #include "vis.h" #include "aggregation.h" diff --git a/routing.h b/routing.h index 8b76424..e2a9872 100644 --- a/routing.h +++ b/routing.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_ROUTING_H_ #define _NET_BATMAN_ADV_ROUTING_H_

-#include "types.h" - void slide_own_bcast_window(struct batman_if *batman_if); void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_packet, diff --git a/send.c b/send.c index 7cc620e..8314276 100644 --- a/send.c +++ b/send.c @@ -25,7 +25,6 @@ #include "translation-table.h" #include "soft-interface.h" #include "hard-interface.h" -#include "types.h" #include "vis.h" #include "aggregation.h" #include "gateway_common.h" diff --git a/send.h b/send.h index bc53ade..b68c272 100644 --- a/send.h +++ b/send.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_SEND_H_ #define _NET_BATMAN_ADV_SEND_H_

-#include "types.h" - int send_skb_packet(struct sk_buff *skb, struct batman_if *batman_if, uint8_t *dst_addr); diff --git a/soft-interface.c b/soft-interface.c index 145e0f7..bd088f8 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -26,7 +26,6 @@ #include "send.h" #include "bat_debugfs.h" #include "translation-table.h" -#include "types.h" #include "hash.h" #include "gateway_common.h" #include "gateway_client.h" diff --git a/translation-table.c b/translation-table.c index a998c25..28a212a 100644 --- a/translation-table.c +++ b/translation-table.c @@ -22,7 +22,6 @@ #include "main.h" #include "translation-table.h" #include "soft-interface.h" -#include "types.h" #include "hash.h" #include "originator.h"

diff --git a/translation-table.h b/translation-table.h index a4f3a37..f19931c 100644 --- a/translation-table.h +++ b/translation-table.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_

-#include "types.h" - int hna_local_init(struct bat_priv *bat_priv); void hna_local_add(struct net_device *soft_iface, uint8_t *addr); void hna_local_remove(struct bat_priv *bat_priv,