git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tipc: Fix minor bugs in link session number handling
[safe/jmp/linux-2.6]
/
net
/
tipc
/
core.c
diff --git
a/net/tipc/core.c
b/net/tipc/core.c
index
9a5eb97
..
3256bd7
100644
(file)
--- a/
net/tipc/core.c
+++ b/
net/tipc/core.c
@@
-48,16
+48,8
@@
#include "subscr.h"
#include "config.h"
#include "subscr.h"
#include "config.h"
-int tipc_eth_media_start(void);
-void tipc_eth_media_stop(void);
-int tipc_handler_start(void);
-void tipc_handler_stop(void);
-int tipc_socket_init(void);
-void tipc_socket_stop(void);
-int tipc_netlink_start(void);
-void tipc_netlink_stop(void);
-#define TIPC_MOD_VER "1.6.
2
"
+#define TIPC_MOD_VER "1.6.
4
"
#ifndef CONFIG_TIPC_ZONES
#define CONFIG_TIPC_ZONES 3
#ifndef CONFIG_TIPC_ZONES
#define CONFIG_TIPC_ZONES 3
@@
-125,11
+117,11
@@
void tipc_core_stop_net(void)
* start_net - start TIPC networking sub-systems
*/
* start_net - start TIPC networking sub-systems
*/
-int tipc_core_start_net(
void
)
+int tipc_core_start_net(
unsigned long addr
)
{
int res;
{
int res;
- if ((res = tipc_net_start()) ||
+ if ((res = tipc_net_start(
addr
)) ||
(res = tipc_eth_media_start())) {
tipc_core_stop_net();
}
(res = tipc_eth_media_start())) {
tipc_core_stop_net();
}
@@
-172,8
+164,7
@@
int tipc_core_start(void)
tipc_mode = TIPC_NODE_MODE;
if ((res = tipc_handler_start()) ||
tipc_mode = TIPC_NODE_MODE;
if ((res = tipc_handler_start()) ||
- (res = tipc_ref_table_init(tipc_max_ports + tipc_max_subscriptions,
- tipc_random)) ||
+ (res = tipc_ref_table_init(tipc_max_ports, tipc_random)) ||
(res = tipc_reg_start()) ||
(res = tipc_nametbl_init()) ||
(res = tipc_k_signal((Handler)tipc_subscr_start, 0)) ||
(res = tipc_reg_start()) ||
(res = tipc_nametbl_init()) ||
(res = tipc_k_signal((Handler)tipc_subscr_start, 0)) ||
@@
-190,7
+181,7
@@
static int __init tipc_init(void)
{
int res;
{
int res;
- tipc_log_re
init
(CONFIG_TIPC_LOG);
+ tipc_log_re
size
(CONFIG_TIPC_LOG);
info("Activated (version " TIPC_MOD_VER
" compiled " __DATE__ " " __TIME__ ")\n");
info("Activated (version " TIPC_MOD_VER
" compiled " __DATE__ " " __TIME__ ")\n");
@@
-217,7
+208,7
@@
static void __exit tipc_exit(void)
tipc_core_stop_net();
tipc_core_stop();
info("Deactivated\n");
tipc_core_stop_net();
tipc_core_stop();
info("Deactivated\n");
- tipc_log_
stop(
);
+ tipc_log_
resize(0
);
}
module_init(tipc_init);
}
module_init(tipc_init);