tipc: Remove obsolete inclusions of header files

Gets rid of #include statements that are no longer required as a
result of the merging of obsolete native API header file content
into other TIPC include files.

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>

diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index 8a2e89bffde5ca6677b3562a65b61380a3f7e0a7..886715a752590f56972de9c6d58956c4940d8680 100644 (file)
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@@ -35,11 +35,9 @@
  */
 
 #include "core.h"
-#include "dbg.h"
 #include "addr.h"
 #include "zone.h"
 #include "cluster.h"
-#include "net.h"
 
 /**
  * tipc_addr_domain_valid - validates a network domain address

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 7d449f03c38532c5f2c46ac806fc992cf6bbb2ad..6d828d9eda42ef0b70390e8dfe294692bd8a9530 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -36,18 +36,9 @@
  */
 
 #include "core.h"
-#include "msg.h"
-#include "dbg.h"
 #include "link.h"
-#include "net.h"
-#include "node.h"
 #include "port.h"
-#include "addr.h"
-#include "node_subscr.h"
 #include "name_distr.h"
-#include "bearer.h"
-#include "name_table.h"
-#include "port.h"
 #include "bcast.h"
 
 #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 9927d1d56c4f1f8e2a015752be33b781c6ea6480..347f255b0de2e876d2860a9587195a1104a49297 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -36,12 +36,9 @@
 
 #include "core.h"
 #include "config.h"
-#include "dbg.h"
 #include "bearer.h"
-#include "link.h"
 #include "port.h"
 #include "discover.h"
-#include "bcast.h"
 
 #define MAX_ADDR_STR 32
 

diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 49af7fae8b5adf24fa1d6e3af26582bc2b9dfd37..8dc0e9268a2881ec4391d18a67491cc1d86eb066 100644 (file)
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -37,7 +37,6 @@
 #ifndef _TIPC_BEARER_H
 #define _TIPC_BEARER_H
 
-#include "core.h"
 #include "bcast.h"
 
 #define MAX_BEARERS 8

diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c
index 7fea14b98b9716ba927e0476979cbf9747f9850b..ee251798d482f7080ca7210ad550b6434ce8afad 100644 (file)
--- a/net/tipc/cluster.c
+++ b/net/tipc/cluster.c
@@ -36,13 +36,7 @@
 
 #include "core.h"
 #include "cluster.h"
-#include "addr.h"
-#include "node_subscr.h"
 #include "link.h"
-#include "node.h"
-#include "net.h"
-#include "msg.h"
-#include "bearer.h"
 
 static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
                                u32 lower, u32 upper);

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 82267f3cd3b7d68afe0ddec524cb489fc72641ed..5bb369669729a35e4744371e258141062ba8052c 100644 (file)
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -35,14 +35,9 @@
  */
 
 #include "core.h"
-#include "dbg.h"
-#include "bearer.h"
 #include "port.h"
 #include "link.h"
-#include "zone.h"
-#include "addr.h"
 #include "name_table.h"
-#include "node.h"
 #include "user_reg.h"
 #include "config.h"
 

diff --git a/net/tipc/config.h b/net/tipc/config.h
index 481e12ece715dcc9c02b44928e1cf2b3b2635eb1..443159a166fd535cf2981ddd9813ffd023804ac9 100644 (file)
--- a/net/tipc/config.h
+++ b/net/tipc/config.h
@@ -39,7 +39,6 @@
 
 /* ---------------------------------------------------------------------- */
 
-#include "core.h"
 #include "link.h"
 
 struct sk_buff *tipc_cfg_reply_alloc(int payload_size);

diff --git a/net/tipc/core.c b/net/tipc/core.c
index 785362f6a411b236d9f69d99ec3812755e04bfaa..f5d62c174de21a83f87c810a102366359b6d88ae 100644 (file)
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -40,7 +40,6 @@
 #include <linux/random.h>
 
 #include "core.h"
-#include "dbg.h"
 #include "ref.h"
 #include "net.h"
 #include "user_reg.h"

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 4a7cd3719b781f42739d8c5c524e4a324e09d79b..f2ce36baf42ee4f367d6c652ff0c9ef27b4d786e 100644 (file)
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -35,9 +35,7 @@
  */
 
 #include "core.h"
-#include "dbg.h"
 #include "link.h"
-#include "zone.h"
 #include "discover.h"
 #include "port.h"
 #include "name_table.h"

diff --git a/net/tipc/discover.h b/net/tipc/discover.h
index f8e75063612340fa8ea7e3f653dd5e1978ee47f8..d2c3cffb79fc8303d5ef2c5d3c7ad95783089a72 100644 (file)
--- a/net/tipc/discover.h
+++ b/net/tipc/discover.h
@@ -37,8 +37,6 @@
 #ifndef _TIPC_DISCOVER_H
 #define _TIPC_DISCOVER_H
 
-#include "core.h"
-
 struct link_req;
 
 struct link_req *tipc_disc_init_link_req(struct bearer *b_ptr,

diff --git a/net/tipc/link.c b/net/tipc/link.c
index b31992ccd5d3a2dc60c3d0e4ca9de186ff9e6682..aee6579438c7db29e2b4a043da3afd297d4c5ccd 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -35,19 +35,11 @@
  */
 
 #include "core.h"
-#include "dbg.h"
 #include "link.h"
-#include "net.h"
-#include "node.h"
 #include "port.h"
-#include "addr.h"
-#include "node_subscr.h"
 #include "name_distr.h"
-#include "bearer.h"
-#include "name_table.h"
 #include "discover.h"
 #include "config.h"
-#include "bcast.h"
 
 
 /*

diff --git a/net/tipc/link.h b/net/tipc/link.h
index f98bc613de67b247b0369df611044bf75604e5cd..c562888d25dad77973e3f06cb60e4a590ee9e276 100644 (file)
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
@@ -39,7 +39,6 @@
 
 #include "dbg.h"
 #include "msg.h"
-#include "bearer.h"
 #include "node.h"
 
 #define PUSH_FAILED   1

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index ecb532fb03512f69720f1c47c6ce9a03b0e7264f..ee6b4c68d4a403fb3b9331cd1e4a9810a5a0c6ce 100644 (file)
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -36,9 +36,7 @@
 
 #include "core.h"
 #include "addr.h"
-#include "dbg.h"
 #include "msg.h"
-#include "bearer.h"
 
 u32 tipc_msg_tot_importance(struct tipc_msg *m)
 {

diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 7b907171f879ecf7ab2c1a33c0ce6cf2e1f5fca4..10ff48be3c01e6746d70ccbcb25a29d7ad22b7db 100644 (file)
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -36,9 +36,7 @@
 
 #include "core.h"
 #include "cluster.h"
-#include "dbg.h"
 #include "link.h"
-#include "msg.h"
 #include "name_distr.h"
 
 #define ITEM_SIZE sizeof(struct distr_item)

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 3a8de4334da15905adb23e9c84f72bdb58c01fed..d5adb04567462ad5ab45d5fd9090d540b1413997 100644 (file)
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -36,15 +36,10 @@
 
 #include "core.h"
 #include "config.h"
-#include "dbg.h"
 #include "name_table.h"
 #include "name_distr.h"
-#include "addr.h"
-#include "node_subscr.h"
 #include "subscr.h"
 #include "port.h"
-#include "cluster.h"
-#include "bcast.h"
 
 static int tipc_nametbl_size = 1024;           /* must be a power of 2 */
 

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 1a621cfd66046566df9c4e6a4fb33797fe3464ea..c2b4b86c2e6a5d19c88988a3bd1f73c719da9f45 100644 (file)
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -35,18 +35,13 @@
  */
 
 #include "core.h"
-#include "bearer.h"
 #include "net.h"
 #include "zone.h"
-#include "addr.h"
 #include "name_table.h"
 #include "name_distr.h"
 #include "subscr.h"
 #include "link.h"
-#include "msg.h"
 #include "port.h"
-#include "bcast.h"
-#include "discover.h"
 #include "config.h"
 
 /*

diff --git a/net/tipc/node.c b/net/tipc/node.c
index b4d87eb2dc5d871352d6d1f54ea73df830d83779..bd959a855fd5f0bee778649ac269f085180ee024 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -37,13 +37,7 @@
 #include "core.h"
 #include "config.h"
 #include "node.h"
-#include "cluster.h"
-#include "net.h"
-#include "addr.h"
-#include "node_subscr.h"
-#include "link.h"
 #include "port.h"
-#include "bearer.h"
 #include "name_distr.h"
 
 void node_print(struct print_buf *buf, struct tipc_node *n_ptr, char *str);

diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c
index 19194d476a9e6e9ea1a5da38f55d6df4764628c0..018a55332d9178248671f33dfd4a5577e476cb0d 100644 (file)
--- a/net/tipc/node_subscr.c
+++ b/net/tipc/node_subscr.c
@@ -35,10 +35,8 @@
  */
 
 #include "core.h"
-#include "dbg.h"
 #include "node_subscr.h"
 #include "node.h"
-#include "addr.h"
 
 /**
  * tipc_nodesub_subscribe - create "node down" subscription for specified node

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 82092eaa15366f4262689bd58e37b9a2d91c60b8..e822117b79ad175cfa61626c6af9cd867465756d 100644 (file)
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -36,15 +36,9 @@
 
 #include "core.h"
 #include "config.h"
-#include "dbg.h"
 #include "port.h"
-#include "addr.h"
-#include "link.h"
-#include "node.h"
 #include "name_table.h"
 #include "user_reg.h"
-#include "msg.h"
-#include "bcast.h"
 
 /* Connection management: */
 #define PROBING_INTERVAL 3600000       /* [ms] => 1 h */

diff --git a/net/tipc/port.h b/net/tipc/port.h
index 8b9d87a3efae40e304a3953b7f1723d8a8b80acb..e038ce1ef8e86012b86d5bb0ea03139f09cc9302 100644 (file)
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -37,11 +37,9 @@
 #ifndef _TIPC_PORT_H
 #define _TIPC_PORT_H
 
-#include "core.h"
 #include "ref.h"
 #include "net.h"
 #include "msg.h"
-#include "dbg.h"
 #include "node_subscr.h"
 
 #define TIPC_FLOW_CONTROL_WIN 512

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index a857e6ea857e9e37d26050fef2349c2498a83d92..e7fb38ba577d956f82f3e133ad1545f13051f542 100644 (file)
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -35,11 +35,8 @@
  */
 
 #include "core.h"
-#include "dbg.h"
 #include "name_table.h"
 #include "user_reg.h"
-#include "port.h"
-#include "ref.h"
 #include "subscr.h"
 
 /**

diff --git a/net/tipc/zone.c b/net/tipc/zone.c
index 83f8b5e91fc8e45e7f0181dc36f1d5a623e0ae4b..1b61ca8c48ef6cacc0dc1d5dd48435aa7c51391e 100644 (file)
--- a/net/tipc/zone.c
+++ b/net/tipc/zone.c
@@ -36,9 +36,6 @@
 
 #include "core.h"
 #include "zone.h"
-#include "net.h"
-#include "addr.h"
-#include "node_subscr.h"
 #include "cluster.h"
 #include "node.h"