diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-20 20:40:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-20 20:40:31 -0400 |
| commit | 167de77fd4e5646f98f67bd9f0a0054a891f6ff4 (patch) | |
| tree | abe31d384dbe9c7bad0da839600423d1eda4b6e2 /net/tipc/net.c | |
| parent | 2528a5dc4331aebbb990f2a56d179dfa35de4a4f (diff) | |
| parent | 9d52ce4bd3fa9e0cf1658791f2c680e20e0598a1 (diff) | |
| download | olio-linux-3.10-167de77fd4e5646f98f67bd9f0a0054a891f6ff4.tar.xz olio-linux-3.10-167de77fd4e5646f98f67bd9f0a0054a891f6ff4.zip | |
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index d4531b07076..5fab4ff24a9 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -178,11 +178,12 @@ int tipc_net_start(u32 addr) tipc_subscr_stop(); tipc_cfg_stop(); + write_lock_bh(&tipc_net_lock); tipc_own_addr = addr; tipc_named_reinit(); tipc_port_reinit(); - tipc_bclink_init(); + write_unlock_bh(&tipc_net_lock); tipc_k_signal((Handler)tipc_subscr_start, 0); tipc_k_signal((Handler)tipc_cfg_init, 0); |