Commit 970122fd authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: make bearer set up in module insertion stage 



Accidentally a side effect is involved by commit 6e967adf(tipc:
relocate common functions from media to bearer). Now tipc stack
handler of receiving packets from netdevices as well as netdevice
notification handler are registered when bearer is enabled rather
than tipc module initialization stage, but the two handlers are
both unregistered in tipc module exit phase. If tipc module is
inserted and then immediately removed, the following warning
message will appear:

"dev_remove_pack: ffffffffa0380940 not found"

This is because in module insertion stage tipc stack packet handler
is not registered at all, but in module exit phase dev_remove_pack()
needs to remove it. Of course, dev_remove_pack() cannot find tipc
protocol handler from the kernel protocol handler list so that the
warning message is printed out.

But if registering the two handlers is adjusted from enabling bearer
phase into inserting module stage, the warning message will be
eliminated. Due to this change, tipc_core_start_net() and
tipc_core_stop_net() can be deleted as well.

Reported-by: default avatarWang Weidong <wangweidong1@huawei.com>
Cc: Jon Maloy <jon.maloy@ericsson.com>
Cc: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fe7ed47

net/tipc/bearer.c

+6 −1
Original line number Diff line number Diff line
@@ -610,8 +610,13 @@ static struct notifier_block notifier = { 


int tipc_bearer_setup(void)

{

	int err;



	err = register_netdevice_notifier(&notifier);

	if (err)

		return err;

	dev_add_pack(&tipc_packet_type);

	return register_netdevice_notifier(&notifier);

	return 0;

}



void tipc_bearer_cleanup(void)

net/tipc/config.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static struct sk_buff *cfg_set_own_addr(void) 
	if (tipc_own_addr)

		return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED

						   " (cannot change node address once assigned)");

	tipc_core_start_net(addr);

	tipc_net_start(addr);

	return tipc_cfg_reply_none();

}

net/tipc/core.c

+9 −29
Original line number Diff line number Diff line
@@ -76,38 +76,14 @@ struct sk_buff *tipc_buf_acquire(u32 size) 
	return skb;

}



/**

 * tipc_core_stop_net - shut down TIPC networking sub-systems

 */

static void tipc_core_stop_net(void)

{

	tipc_net_stop();

	tipc_bearer_cleanup();

}



/**

 * start_net - start TIPC networking sub-systems

 */

int tipc_core_start_net(unsigned long addr)

{

	int res;



	tipc_net_start(addr);

	res = tipc_bearer_setup();

	if (res < 0)

		goto err;

	return res;



err:

	tipc_core_stop_net();

	return res;

}



/**

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

 */

static void tipc_core_stop(void)

{

	tipc_handler_stop();

	tipc_net_stop();

	tipc_bearer_cleanup();

	tipc_netlink_stop();

	tipc_cfg_stop();

	tipc_subscr_stop();
@@ -158,7 +134,13 @@ static int tipc_core_start(void) 
	if (err)

		goto out_cfg;



	err = tipc_bearer_setup();

	if (err)

		goto out_bearer;



	return 0;

out_bearer:

	tipc_cfg_stop();

out_cfg:

	tipc_subscr_stop();

out_subscr:
@@ -203,8 +185,6 @@ static int __init tipc_init(void) 


static void __exit tipc_exit(void)

{

	tipc_handler_stop();

	tipc_core_stop_net();

	tipc_core_stop();

	pr_info("Deactivated\n");

}

net/tipc/core.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ extern int tipc_random __read_mostly; 
/*

 * Routines available to privileged subsystems

 */

int tipc_core_start_net(unsigned long);

int tipc_handler_start(void);

void tipc_handler_stop(void);

int tipc_netlink_start(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE