diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 13:59:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-01 16:57:54 -0500 |
commit | 886ef52a8ce6930a9d0c58267d5b5038ac3e8d30 (patch) | |
tree | 7cd0019938cc0c52301d206a54556f6a355c2529 /net/tipc | |
parent | 6e7e309c62ab584348e0fef90c8e3e48f634dba1 (diff) |
tipc: remove redundant #includes
Eliminates a number of #include statements that no longer serve any
useful purpose.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/addr.c | 1 | ||||
-rw-r--r-- | net/tipc/bcast.c | 1 | ||||
-rw-r--r-- | net/tipc/bearer.c | 1 | ||||
-rw-r--r-- | net/tipc/config.c | 1 | ||||
-rw-r--r-- | net/tipc/core.c | 6 | ||||
-rw-r--r-- | net/tipc/discover.c | 2 | ||||
-rw-r--r-- | net/tipc/eth_media.c | 4 | ||||
-rw-r--r-- | net/tipc/msg.c | 1 | ||||
-rw-r--r-- | net/tipc/name_distr.c | 1 | ||||
-rw-r--r-- | net/tipc/net.c | 2 | ||||
-rw-r--r-- | net/tipc/node.c | 1 | ||||
-rw-r--r-- | net/tipc/socket.c | 11 |
12 files changed, 0 insertions, 32 deletions
diff --git a/net/tipc/addr.c b/net/tipc/addr.c index 483868a75b88..88463d9a6f12 100644 --- a/net/tipc/addr.c +++ b/net/tipc/addr.c | |||
@@ -35,7 +35,6 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "node.h" | ||
39 | #include "addr.h" | 38 | #include "addr.h" |
40 | 39 | ||
41 | /** | 40 | /** |
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 22a10fadc8c6..c0f3b096e7f5 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include "core.h" | 38 | #include "core.h" |
39 | #include "link.h" | 39 | #include "link.h" |
40 | #include "port.h" | 40 | #include "port.h" |
41 | #include "name_distr.h" | ||
42 | #include "bcast.h" | 41 | #include "bcast.h" |
43 | 42 | ||
44 | #define MAX_PKT_DEFAULT_MCAST 1500 /* bcast link max packet size (fixed) */ | 43 | #define MAX_PKT_DEFAULT_MCAST 1500 /* bcast link max packet size (fixed) */ |
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 24dc6c2c75ad..040f3ed32ec8 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "config.h" | 38 | #include "config.h" |
39 | #include "bearer.h" | 39 | #include "bearer.h" |
40 | #include "port.h" | ||
41 | #include "discover.h" | 40 | #include "discover.h" |
42 | 41 | ||
43 | #define MAX_ADDR_STR 32 | 42 | #define MAX_ADDR_STR 32 |
diff --git a/net/tipc/config.c b/net/tipc/config.c index a7894ff77ae9..6c67132f8652 100644 --- a/net/tipc/config.c +++ b/net/tipc/config.c | |||
@@ -36,7 +36,6 @@ | |||
36 | 36 | ||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "port.h" | 38 | #include "port.h" |
39 | #include "link.h" | ||
40 | #include "name_table.h" | 39 | #include "name_table.h" |
41 | #include "config.h" | 40 | #include "config.h" |
42 | 41 | ||
diff --git a/net/tipc/core.c b/net/tipc/core.c index a02bc490caae..60b85ec6d106 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
@@ -34,14 +34,8 @@ | |||
34 | * POSSIBILITY OF SUCH DAMAGE. | 34 | * POSSIBILITY OF SUCH DAMAGE. |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include <linux/init.h> | ||
38 | #include <linux/module.h> | ||
39 | #include <linux/kernel.h> | ||
40 | #include <linux/random.h> | ||
41 | |||
42 | #include "core.h" | 37 | #include "core.h" |
43 | #include "ref.h" | 38 | #include "ref.h" |
44 | #include "net.h" | ||
45 | #include "name_table.h" | 39 | #include "name_table.h" |
46 | #include "subscr.h" | 40 | #include "subscr.h" |
47 | #include "config.h" | 41 | #include "config.h" |
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index e7223789d150..be28f5adc770 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "link.h" | 38 | #include "link.h" |
39 | #include "discover.h" | 39 | #include "discover.h" |
40 | #include "port.h" | ||
41 | #include "name_table.h" | ||
42 | 40 | ||
43 | #define TIPC_LINK_REQ_INIT 125 /* min delay during bearer start up */ | 41 | #define TIPC_LINK_REQ_INIT 125 /* min delay during bearer start up */ |
44 | #define TIPC_LINK_REQ_FAST 2000 /* normal delay if bearer has no links */ | 42 | #define TIPC_LINK_REQ_FAST 2000 /* normal delay if bearer has no links */ |
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index ee683cc8f4b1..101d9cb6a559 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
@@ -34,10 +34,6 @@ | |||
34 | * POSSIBILITY OF SUCH DAMAGE. | 34 | * POSSIBILITY OF SUCH DAMAGE. |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include <linux/netdevice.h> | ||
38 | #include <linux/slab.h> | ||
39 | #include <net/net_namespace.h> | ||
40 | |||
41 | #include "core.h" | 37 | #include "core.h" |
42 | #include "bearer.h" | 38 | #include "bearer.h" |
43 | 39 | ||
diff --git a/net/tipc/msg.c b/net/tipc/msg.c index a029cdc2df6d..2571ffb4d350 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c | |||
@@ -35,7 +35,6 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "addr.h" | ||
39 | #include "msg.h" | 38 | #include "msg.h" |
40 | 39 | ||
41 | u32 tipc_msg_tot_importance(struct tipc_msg *m) | 40 | u32 tipc_msg_tot_importance(struct tipc_msg *m) |
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 0dd648ec0809..376a30b9fd72 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c | |||
@@ -35,7 +35,6 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "addr.h" | ||
39 | #include "link.h" | 38 | #include "link.h" |
40 | #include "name_distr.h" | 39 | #include "name_distr.h" |
41 | 40 | ||
diff --git a/net/tipc/net.c b/net/tipc/net.c index 6290becd35be..9bacfd00b91e 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
@@ -36,10 +36,8 @@ | |||
36 | 36 | ||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "net.h" | 38 | #include "net.h" |
39 | #include "name_table.h" | ||
40 | #include "name_distr.h" | 39 | #include "name_distr.h" |
41 | #include "subscr.h" | 40 | #include "subscr.h" |
42 | #include "link.h" | ||
43 | #include "port.h" | 41 | #include "port.h" |
44 | #include "config.h" | 42 | #include "config.h" |
45 | 43 | ||
diff --git a/net/tipc/node.c b/net/tipc/node.c index fb54719679a6..126d774883dd 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "core.h" | 37 | #include "core.h" |
38 | #include "config.h" | 38 | #include "config.h" |
39 | #include "node.h" | 39 | #include "node.h" |
40 | #include "port.h" | ||
41 | #include "name_distr.h" | 40 | #include "name_distr.h" |
42 | 41 | ||
43 | static void node_lost_contact(struct tipc_node *n_ptr); | 42 | static void node_lost_contact(struct tipc_node *n_ptr); |
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 7a21a5ee43e8..f972c0b4a719 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -34,17 +34,6 @@ | |||
34 | * POSSIBILITY OF SUCH DAMAGE. | 34 | * POSSIBILITY OF SUCH DAMAGE. |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include <linux/module.h> | ||
38 | #include <linux/types.h> | ||
39 | #include <linux/net.h> | ||
40 | #include <linux/socket.h> | ||
41 | #include <linux/errno.h> | ||
42 | #include <linux/mm.h> | ||
43 | #include <linux/poll.h> | ||
44 | #include <linux/fcntl.h> | ||
45 | #include <linux/gfp.h> | ||
46 | #include <asm/string.h> | ||
47 | #include <asm/atomic.h> | ||
48 | #include <net/sock.h> | 37 | #include <net/sock.h> |
49 | 38 | ||
50 | #include <linux/tipc.h> | 39 | #include <linux/tipc.h> |