diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 03:57:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 03:57:27 -0400 |
| commit | e8c8ce54807b19e90ac84e609b13f7d4e337eab1 (patch) | |
| tree | ae7d65ae17d55aee197b605ce1a193fe594af614 /net/tipc/core.c | |
| parent | 5db4298133d99b3dfc60d6899ac9df169769c899 (diff) | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
Merge tag 'v4.6-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tipc/core.c')
| -rw-r--r-- | net/tipc/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 03a842870c52..e2bdb07a49a2 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
| @@ -69,6 +69,7 @@ static int __net_init tipc_init_net(struct net *net) | |||
| 69 | if (err) | 69 | if (err) |
| 70 | goto out_nametbl; | 70 | goto out_nametbl; |
| 71 | 71 | ||
| 72 | INIT_LIST_HEAD(&tn->dist_queue); | ||
| 72 | err = tipc_topsrv_start(net); | 73 | err = tipc_topsrv_start(net); |
| 73 | if (err) | 74 | if (err) |
| 74 | goto out_subscr; | 75 | goto out_subscr; |