aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/core.c')
-rw-r--r--net/tipc/core.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 4a8b7955e0e0..674bd2698528 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -44,9 +44,6 @@
44 44
45#include <linux/module.h> 45#include <linux/module.h>
46 46
47/* global variables used by multiple sub-systems within TIPC */
48int tipc_random __read_mostly;
49
50/* configurable TIPC parameters */ 47/* configurable TIPC parameters */
51int tipc_net_id __read_mostly; 48int tipc_net_id __read_mostly;
52int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */ 49int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */
@@ -58,6 +55,7 @@ static int __net_init tipc_init_net(struct net *net)
58 55
59 tn->net_id = 4711; 56 tn->net_id = 4711;
60 tn->own_addr = 0; 57 tn->own_addr = 0;
58 get_random_bytes(&tn->random, sizeof(int));
61 INIT_LIST_HEAD(&tn->node_list); 59 INIT_LIST_HEAD(&tn->node_list);
62 spin_lock_init(&tn->node_list_lock); 60 spin_lock_init(&tn->node_list_lock);
63 61
@@ -109,8 +107,6 @@ static int __init tipc_init(void)
109 TIPC_CRITICAL_IMPORTANCE; 107 TIPC_CRITICAL_IMPORTANCE;
110 sysctl_tipc_rmem[2] = TIPC_CONN_OVERLOAD_LIMIT; 108 sysctl_tipc_rmem[2] = TIPC_CONN_OVERLOAD_LIMIT;
111 109
112 get_random_bytes(&tipc_random, sizeof(tipc_random));
113
114 err = tipc_netlink_start(); 110 err = tipc_netlink_start();
115 if (err) 111 if (err)
116 goto out_netlink; 112 goto out_netlink;