* [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions
@ 2011-02-04 13:57 Linus Lüssing
2011-02-04 13:57 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Switch order of types.h and compat.h inclusion Linus Lüssing
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Linus Lüssing @ 2011-02-04 13:57 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Linus Lüssing
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(-)
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,
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Switch order of types.h and compat.h inclusion
2011-02-04 13:57 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions Linus Lüssing
@ 2011-02-04 13:57 ` Linus Lüssing
2011-02-06 23:06 ` Marek Lindner
2011-02-05 3:51 ` [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions Sven Eckelmann
2011-02-06 23:05 ` Marek Lindner
2 siblings, 1 reply; 5+ messages in thread
From: Linus Lüssing @ 2011-02-04 13:57 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Linus Lüssing, Linus Lüssing
The compat.h changes should be transparent for any other of our source
files - even for types.h. Therefore switching the order.
Signed-off-by: Linus Lüssing <linus.luessing@acsom.ch>
---
main.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/batman-adv/main.h b/batman-adv/main.h
index 1ec9986..bd8470d 100644
--- a/batman-adv/main.h
+++ b/batman-adv/main.h
@@ -114,10 +114,10 @@
#include <net/sock.h> /* struct sock */
#include <linux/jiffies.h>
#include <linux/seq_file.h>
-#include "types.h"
-
#include "compat.h"
+#include "types.h"
+
#ifndef REVISION_VERSION
#define REVISION_VERSION_STR ""
#else
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions
2011-02-04 13:57 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions Linus Lüssing
2011-02-04 13:57 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Switch order of types.h and compat.h inclusion Linus Lüssing
@ 2011-02-05 3:51 ` Sven Eckelmann
2011-02-06 23:05 ` Marek Lindner
2 siblings, 0 replies; 5+ messages in thread
From: Sven Eckelmann @ 2011-02-05 3:51 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Linus Lüssing
[-- Attachment #1: Type: Text/Plain, Size: 278 bytes --]
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>
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions
2011-02-04 13:57 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions Linus Lüssing
2011-02-04 13:57 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Switch order of types.h and compat.h inclusion Linus Lüssing
2011-02-05 3:51 ` [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions Sven Eckelmann
@ 2011-02-06 23:05 ` Marek Lindner
2 siblings, 0 replies; 5+ messages in thread
From: Marek Lindner @ 2011-02-06 23:05 UTC (permalink / raw)
To: The list for a Better Approach To Mobile Ad-hoc Networking
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-06 23:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-04 13:57 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions Linus Lüssing
2011-02-04 13:57 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Switch order of types.h and compat.h inclusion Linus Lüssing
2011-02-06 23:06 ` Marek Lindner
2011-02-05 3:51 ` [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions Sven Eckelmann
2011-02-06 23:05 ` Marek Lindner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox