Commit 34e46258 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: manually inline net_start/stop, make assoc. vars static 



Relocates network-related variables into the subsystem files where
they are now primarily used (following the recent rework of TIPC's
node table), and converts globals into locals where possible. Changes
the initialization of tipc_num_links from run-time to compile-time,
and eliminates the net_start routine that becomes empty as a result.
Also eliminates the corresponding net_stop routine by moving its
(trivial) content into the one location that called the routine.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 672d99e1

net/tipc/net.c

+4 −21
Original line number Original line Diff line number Diff line
@@ -109,22 +109,6 @@ 
*/

*/





DEFINE_RWLOCK(tipc_net_lock);

DEFINE_RWLOCK(tipc_net_lock);

atomic_t tipc_num_links;



static int net_start(void)

{

	atomic_set(&tipc_num_links, 0);



	return 0;

}



static void net_stop(void)

{

	struct tipc_node *node, *t_node;



	list_for_each_entry_safe(node, t_node, &tipc_node_list, list)

		tipc_node_delete(node);

}





static void net_route_named_msg(struct sk_buff *buf)

static void net_route_named_msg(struct sk_buff *buf)

{

{
@@ -214,9 +198,6 @@ int tipc_net_start(u32 addr) 
	tipc_named_reinit();

	tipc_named_reinit();

	tipc_port_reinit();

	tipc_port_reinit();





	res = net_start();

	if (res)

		return res;

	res = tipc_bclink_init();

	res = tipc_bclink_init();

	if (res)

	if (res)

		return res;

		return res;
@@ -232,14 +213,16 @@ int tipc_net_start(u32 addr) 




void tipc_net_stop(void)

void tipc_net_stop(void)

{

{

	struct tipc_node *node, *t_node;



	if (tipc_mode != TIPC_NET_MODE)

	if (tipc_mode != TIPC_NET_MODE)

		return;

		return;

	write_lock_bh(&tipc_net_lock);

	write_lock_bh(&tipc_net_lock);

	tipc_bearer_stop();

	tipc_bearer_stop();

	tipc_mode = TIPC_NODE_MODE;

	tipc_mode = TIPC_NODE_MODE;

	tipc_bclink_stop();

	tipc_bclink_stop();

	net_stop();

	list_for_each_entry_safe(node, t_node, &tipc_node_list, list);

		tipc_node_delete(node);

	write_unlock_bh(&tipc_net_lock);

	write_unlock_bh(&tipc_net_lock);

	info("Left network mode\n");

	info("Left network mode\n");

}
 
}

net/tipc/net.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -37,8 +37,6 @@ 
#ifndef _TIPC_NET_H

#ifndef _TIPC_NET_H

#define _TIPC_NET_H

#define _TIPC_NET_H





extern atomic_t tipc_num_links;



extern rwlock_t tipc_net_lock;

extern rwlock_t tipc_net_lock;





void tipc_net_route_msg(struct sk_buff *buf);

void tipc_net_route_msg(struct sk_buff *buf);

net/tipc/node.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,8 @@ static DEFINE_SPINLOCK(node_create_lock); 
static struct hlist_head node_htable[NODE_HTABLE_SIZE];

static struct hlist_head node_htable[NODE_HTABLE_SIZE];

LIST_HEAD(tipc_node_list);

LIST_HEAD(tipc_node_list);

static u32 tipc_num_nodes;

static u32 tipc_num_nodes;



static atomic_t tipc_num_links = ATOMIC_INIT(0);

u32 tipc_own_tag;

u32 tipc_own_tag;





/**

/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE