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>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 5e86d6f0c0fbcd5591fac148b3e0f1c337b36d6c..319a7ccf6efa803075515104d96256d2b786707b 100644 (file)
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/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/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index 08b185959501411c21dc25f48551ce495e2e0dab..462b190fa1019bc795e0ce6b648e739d5c0b7b52 100644 (file)
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/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/net/batman-adv/main.c b/net/batman-adv/main.c
index dc9248d9ea5fa020d5b9445bdc3b0135c2c1f4f2..06d956c91c274e1755c6c9d097c2c628035d0c29 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/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/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 028f73967b009f61979d7b4779ce769462069f4e..827414067e461f88a546620af343380121c66cc9 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/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/net/batman-adv/routing.h b/net/batman-adv/routing.h
index ceeca6f6ad16656f7aaad4097e9aa862d8191681..a09d16f0c3ab6a64d96badbe89c0b3462a2c83ec 100644 (file)
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/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/net/batman-adv/send.c b/net/batman-adv/send.c
index 7cc620e8aa1e870da21757fa03d1b014a743a5e5..831427694fc21ea20f168dee6f5b33d6b372554b 100644 (file)
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/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/net/batman-adv/send.h b/net/batman-adv/send.h
index bc53adede58d862ea0f87d2918c8f254bf2d1b71..b68c272cb84f309d97ab11fd7595beed3173ffdb 100644 (file)
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/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/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 145e0f782923e6d6fc63c26e742f950862a8a4c3..bd088f877e3889204401baa13d538792b561f848 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/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/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index f6917dde42ce239be10fd0967cff1ff19d1cb166..7fb6726ccbdd624e7b7ba6c0b46fea41d714848c 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/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/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h
index a4f3a37fd6eda67e46fae7a50eda16759a27e3ed..f19931ca1457530e10c679354b479e4eb2425675 100644 (file)
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/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,