aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/net.c
diff options
context:
space:
mode:
authorJon Paul Maloy <jon.maloy@ericsson.com>2015-10-22 08:51:33 -0400
committerDavid S. Miller <davem@davemloft.net>2015-10-24 06:56:24 -0700
commit6beb19a62a87ef6f7107fcd43c2cc1ebad3edfb5 (patch)
tree9183a5007a4d95f451eef1848486a498e9831b46 /net/tipc/net.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-dev-6beb19a62a87ef6f7107fcd43c2cc1ebad3edfb5.tar.xz
linux-dev-6beb19a62a87ef6f7107fcd43c2cc1ebad3edfb5.zip
tipc: move bcast definitions to bcast.c
Currently, a number of structure and function definitions related to the broadcast functionality are unnecessarily exposed in the file bcast.h. This obscures the fact that the external interface towards the broadcast link in fact is very narrow, and causes unnecessary recompilations of other files when anything changes in those definitions. In this commit, we move as many of those definitions as is currently possible to the file bcast.c. We also rename the structure 'tipc_bclink' to 'tipc_bc_base', both since the name does not correctly describe the contents of this struct, and will do so even less in the future, and because we want to use the term 'link' more appropriately in the functionality introduced later in this series. Finally, we rename a couple of functions, such as tipc_bclink_xmit() and others that will be kept in the future, to include the term 'bcast' instead. There are no functional changes in this commit. Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Reviewed-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
-rw-r--r--net/tipc/net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index d6d1399ae229..dc623d5358aa 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -117,7 +117,7 @@ int tipc_net_start(struct net *net, u32 addr)
tn->own_addr = addr;
tipc_named_reinit(net);
tipc_sk_reinit(net);
- res = tipc_bclink_init(net);
+ res = tipc_bcast_init(net);
if (res)
return res;
@@ -142,7 +142,7 @@ void tipc_net_stop(struct net *net)
tn->own_addr);
rtnl_lock();
tipc_bearer_stop(net);
- tipc_bclink_stop(net);
+ tipc_bcast_stop(net);
tipc_node_stop(net);
rtnl_unlock();