Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b8326ed authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: remove tipc_core_start/stop routines 



Remove redundant wrapper functions like tipc_core_start() and
tipc_core_stop(), and directly move them to their callers, such
as tipc_init() and tipc_exit(), having us clearly know what are
really done in both initialization and deinitialzation functions.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Tested-by: default avatarTero Aho <Tero.Aho@coriant.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 703068ee

net/tipc/core.c

+23 −43
Original line number Original line Diff line number Diff line
@@ -75,28 +75,21 @@ struct sk_buff *tipc_buf_acquire(u32 size) 
	return skb;

	return skb;

}

}





/**

static int __init tipc_init(void)

 * tipc_core_stop - switch TIPC from SINGLE NODE to NOT RUNNING mode

 */

static void tipc_core_stop(void)

{

	tipc_net_stop();

	tipc_bearer_cleanup();

	tipc_netlink_stop();

	tipc_subscr_stop();

	tipc_nametbl_stop();

	tipc_socket_stop();

	tipc_unregister_sysctl();

	tipc_sk_rht_destroy();

}



/**

 * tipc_core_start - switch TIPC from NOT RUNNING to SINGLE NODE mode

 */

static int tipc_core_start(void)

{

{

	int err;

	int err;





	pr_info("Activated (version " TIPC_MOD_VER ")\n");



	tipc_own_addr = 0;

	tipc_net_id = 4711;



	sysctl_tipc_rmem[0] = TIPC_CONN_OVERLOAD_LIMIT >> 4 <<

			      TIPC_LOW_IMPORTANCE;

	sysctl_tipc_rmem[1] = TIPC_CONN_OVERLOAD_LIMIT >> 4 <<

			      TIPC_CRITICAL_IMPORTANCE;

	sysctl_tipc_rmem[2] = TIPC_CONN_OVERLOAD_LIMIT;



	get_random_bytes(&tipc_random, sizeof(tipc_random));

	get_random_bytes(&tipc_random, sizeof(tipc_random));





	err = tipc_sk_rht_init();

	err = tipc_sk_rht_init();
@@ -127,6 +120,7 @@ static int tipc_core_start(void) 
	if (err)

	if (err)

		goto out_bearer;

		goto out_bearer;





	pr_info("Started in single node mode\n");

	return 0;

	return 0;

out_bearer:

out_bearer:

	tipc_subscr_stop();

	tipc_subscr_stop();
@@ -141,35 +135,21 @@ static int tipc_core_start(void) 
out_nametbl:

out_nametbl:

	tipc_sk_rht_destroy();

	tipc_sk_rht_destroy();

out_reftbl:

out_reftbl:

	return err;

}



static int __init tipc_init(void)

{

	int res;



	pr_info("Activated (version " TIPC_MOD_VER ")\n");



	tipc_own_addr = 0;

	tipc_net_id = 4711;



	sysctl_tipc_rmem[0] = TIPC_CONN_OVERLOAD_LIMIT >> 4 <<

			      TIPC_LOW_IMPORTANCE;

	sysctl_tipc_rmem[1] = TIPC_CONN_OVERLOAD_LIMIT >> 4 <<

			      TIPC_CRITICAL_IMPORTANCE;

	sysctl_tipc_rmem[2] = TIPC_CONN_OVERLOAD_LIMIT;



	res = tipc_core_start();

	if (res)

	pr_err("Unable to start in single node mode\n");

	pr_err("Unable to start in single node mode\n");

	else

	return err;

		pr_info("Started in single node mode\n");

	return res;

}

}





static void __exit tipc_exit(void)

static void __exit tipc_exit(void)

{

{

	tipc_core_stop();

	tipc_net_stop();

	tipc_bearer_cleanup();

	tipc_netlink_stop();

	tipc_subscr_stop();

	tipc_nametbl_stop();

	tipc_socket_stop();

	tipc_unregister_sysctl();

	tipc_sk_rht_destroy();



	pr_info("Deactivated\n");

	pr_info("Deactivated\n");

}

}