diff options
author | Linus Lüssing <linus.luessing@ascom.ch> | 2011-02-06 18:08:37 -0500 |
---|---|---|
committer | Sven Eckelmann <sven@narfation.org> | 2011-02-11 17:30:29 -0500 |
commit | ee1e884194eb19574898ce6d5eaef5e8afdec7f2 (patch) | |
tree | 71ff4163b147b3562093e5090bff7a8d2a2aad4e /net/batman-adv | |
parent | 14062064167ecdda4a17ec9190740c189223550a (diff) |
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>
Diffstat (limited to 'net/batman-adv')
-rw-r--r-- | net/batman-adv/icmp_socket.c | 1 | ||||
-rw-r--r-- | net/batman-adv/icmp_socket.h | 2 | ||||
-rw-r--r-- | net/batman-adv/main.c | 1 | ||||
-rw-r--r-- | net/batman-adv/routing.c | 1 | ||||
-rw-r--r-- | net/batman-adv/routing.h | 2 | ||||
-rw-r--r-- | net/batman-adv/send.c | 1 | ||||
-rw-r--r-- | net/batman-adv/send.h | 2 | ||||
-rw-r--r-- | net/batman-adv/soft-interface.c | 1 | ||||
-rw-r--r-- | net/batman-adv/translation-table.c | 1 | ||||
-rw-r--r-- | net/batman-adv/translation-table.h | 2 |
10 files changed, 0 insertions, 14 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 5e86d6f0c0fb..319a7ccf6efa 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include "icmp_socket.h" | 25 | #include "icmp_socket.h" |
26 | #include "send.h" | 26 | #include "send.h" |
27 | #include "types.h" | ||
28 | #include "hash.h" | 27 | #include "hash.h" |
29 | #include "originator.h" | 28 | #include "originator.h" |
30 | #include "hard-interface.h" | 29 | #include "hard-interface.h" |
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index 08b185959501..462b190fa101 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h | |||
@@ -22,8 +22,6 @@ | |||
22 | #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ | 22 | #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ |
23 | #define _NET_BATMAN_ADV_ICMP_SOCKET_H_ | 23 | #define _NET_BATMAN_ADV_ICMP_SOCKET_H_ |
24 | 24 | ||
25 | #include "types.h" | ||
26 | |||
27 | #define ICMP_SOCKET "socket" | 25 | #define ICMP_SOCKET "socket" |
28 | 26 | ||
29 | void bat_socket_init(void); | 27 | void bat_socket_init(void); |
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index dc9248d9ea5f..06d956c91c27 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include "translation-table.h" | 30 | #include "translation-table.h" |
31 | #include "hard-interface.h" | 31 | #include "hard-interface.h" |
32 | #include "gateway_client.h" | 32 | #include "gateway_client.h" |
33 | #include "types.h" | ||
34 | #include "vis.h" | 33 | #include "vis.h" |
35 | #include "hash.h" | 34 | #include "hash.h" |
36 | 35 | ||
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 028f73967b00..827414067e46 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include "icmp_socket.h" | 28 | #include "icmp_socket.h" |
29 | #include "translation-table.h" | 29 | #include "translation-table.h" |
30 | #include "originator.h" | 30 | #include "originator.h" |
31 | #include "types.h" | ||
32 | #include "ring_buffer.h" | 31 | #include "ring_buffer.h" |
33 | #include "vis.h" | 32 | #include "vis.h" |
34 | #include "aggregation.h" | 33 | #include "aggregation.h" |
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index ceeca6f6ad16..a09d16f0c3ab 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h | |||
@@ -22,8 +22,6 @@ | |||
22 | #ifndef _NET_BATMAN_ADV_ROUTING_H_ | 22 | #ifndef _NET_BATMAN_ADV_ROUTING_H_ |
23 | #define _NET_BATMAN_ADV_ROUTING_H_ | 23 | #define _NET_BATMAN_ADV_ROUTING_H_ |
24 | 24 | ||
25 | #include "types.h" | ||
26 | |||
27 | void slide_own_bcast_window(struct batman_if *batman_if); | 25 | void slide_own_bcast_window(struct batman_if *batman_if); |
28 | void receive_bat_packet(struct ethhdr *ethhdr, | 26 | void receive_bat_packet(struct ethhdr *ethhdr, |
29 | struct batman_packet *batman_packet, | 27 | struct batman_packet *batman_packet, |
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 7cc620e8aa1e..831427694fc2 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "translation-table.h" | 25 | #include "translation-table.h" |
26 | #include "soft-interface.h" | 26 | #include "soft-interface.h" |
27 | #include "hard-interface.h" | 27 | #include "hard-interface.h" |
28 | #include "types.h" | ||
29 | #include "vis.h" | 28 | #include "vis.h" |
30 | #include "aggregation.h" | 29 | #include "aggregation.h" |
31 | #include "gateway_common.h" | 30 | #include "gateway_common.h" |
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index bc53adede58d..b68c272cb84f 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h | |||
@@ -22,8 +22,6 @@ | |||
22 | #ifndef _NET_BATMAN_ADV_SEND_H_ | 22 | #ifndef _NET_BATMAN_ADV_SEND_H_ |
23 | #define _NET_BATMAN_ADV_SEND_H_ | 23 | #define _NET_BATMAN_ADV_SEND_H_ |
24 | 24 | ||
25 | #include "types.h" | ||
26 | |||
27 | int send_skb_packet(struct sk_buff *skb, | 25 | int send_skb_packet(struct sk_buff *skb, |
28 | struct batman_if *batman_if, | 26 | struct batman_if *batman_if, |
29 | uint8_t *dst_addr); | 27 | uint8_t *dst_addr); |
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 145e0f782923..bd088f877e38 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "send.h" | 26 | #include "send.h" |
27 | #include "bat_debugfs.h" | 27 | #include "bat_debugfs.h" |
28 | #include "translation-table.h" | 28 | #include "translation-table.h" |
29 | #include "types.h" | ||
30 | #include "hash.h" | 29 | #include "hash.h" |
31 | #include "gateway_common.h" | 30 | #include "gateway_common.h" |
32 | #include "gateway_client.h" | 31 | #include "gateway_client.h" |
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f6917dde42ce..7fb6726ccbdd 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include "main.h" | 22 | #include "main.h" |
23 | #include "translation-table.h" | 23 | #include "translation-table.h" |
24 | #include "soft-interface.h" | 24 | #include "soft-interface.h" |
25 | #include "types.h" | ||
26 | #include "hash.h" | 25 | #include "hash.h" |
27 | #include "originator.h" | 26 | #include "originator.h" |
28 | 27 | ||
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index a4f3a37fd6ed..f19931ca1457 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h | |||
@@ -22,8 +22,6 @@ | |||
22 | #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ | 22 | #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ |
23 | #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ | 23 | #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ |
24 | 24 | ||
25 | #include "types.h" | ||
26 | |||
27 | int hna_local_init(struct bat_priv *bat_priv); | 25 | int hna_local_init(struct bat_priv *bat_priv); |
28 | void hna_local_add(struct net_device *soft_iface, uint8_t *addr); | 26 | void hna_local_add(struct net_device *soft_iface, uint8_t *addr); |
29 | void hna_local_remove(struct bat_priv *bat_priv, | 27 | void hna_local_remove(struct bat_priv *bat_priv, |