diff mbox

[1/2] batman-adv: Remove duplicate types.h inclusions

Message ID 1296827833-27595-1-git-send-email-linus.luessing@ascom.ch (mailing list archive)
State Accepted, archived
Headers

Commit Message

Linus Lüssing Feb. 4, 2011, 1:57 p.m. UTC 
  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>
---
 icmp_socket.c       |    1 -
 icmp_socket.h       |    2 --
 main.c              |    1 -
 routing.c           |    1 -
 routing.h           |    2 --
 send.c              |    1 -
 send.h              |    2 --
 soft-interface.c    |    1 -
 translation-table.c |    1 -
 translation-table.h |    2 --
 10 files changed, 0 insertions(+), 14 deletions(-)

Comments

Sven Eckelmann Feb. 5, 2011, 3:51 a.m. UTC | #1 
On Friday 04 February 2011 14:57:12 Linus Lüssing wrote:
> 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.

Both:

Acked-by: Sven Eckelmann <sven@narfation.org>
Marek Lindner Feb. 6, 2011, 11:05 p.m. UTC | #2 
On Friday 04 February 2011 14:57:12 Linus Lüssing wrote:
> 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.

Applied in revision 1931.

Thanks,
Marek
diff mbox

Patch

diff --git a/batman-adv/icmp_socket.c b/batman-adv/icmp_socket.c
index 10a969c..fc812e1 100644
--- a/batman-adv/icmp_socket.c
+++ b/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/batman-adv/icmp_socket.h b/batman-adv/icmp_socket.h
index 08b1859..462b190 100644
--- a/batman-adv/icmp_socket.h
+++ b/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/batman-adv/main.c b/batman-adv/main.c
index e687e7f..658ad5a 100644
--- a/batman-adv/main.c
+++ b/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/batman-adv/routing.c b/batman-adv/routing.c
index 2861f18..b792df4 100644
--- a/batman-adv/routing.c
+++ b/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/batman-adv/routing.h b/batman-adv/routing.h
index 8b76424..e2a9872 100644
--- a/batman-adv/routing.h
+++ b/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/batman-adv/send.c b/batman-adv/send.c
index 7cc620e..8314276 100644
--- a/batman-adv/send.c
+++ b/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/batman-adv/send.h b/batman-adv/send.h
index bc53ade..b68c272 100644
--- a/batman-adv/send.h
+++ b/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/batman-adv/soft-interface.c b/batman-adv/soft-interface.c
index 145e0f7..bd088f8 100644
--- a/batman-adv/soft-interface.c
+++ b/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/batman-adv/translation-table.c b/batman-adv/translation-table.c
index a998c25..28a212a 100644
--- a/batman-adv/translation-table.c
+++ b/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/batman-adv/translation-table.h b/batman-adv/translation-table.h
index a4f3a37..f19931c 100644
--- a/batman-adv/translation-table.h
+++ b/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,