summaryrefslogtreecommitdiff
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-05-09 13:49:56 +1000
committerDave Airlie <airlied@redhat.com>2016-05-09 13:49:56 +1000
commitbafb86f5bc3173479002555dea7f31d943b12332 (patch)
tree6ec94c96460faf782cdb8781339560e13e0918b0 /net/tipc/core.c
parentba391646d0d43aee3596b616113cce0f22dde627 (diff)
parent44549e8f5eea4e0a41b487b63e616cb089922b99 (diff)
downloadlinux-bafb86f5bc3173479002555dea7f31d943b12332.tar.gz
linux-bafb86f5bc3173479002555dea7f31d943b12332.tar.xz
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have some newer trees to pull in.
Diffstat (limited to 'net/tipc/core.c')
-rw-r--r--net/tipc/core.c1
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)
if (err)
goto out_nametbl;
+ INIT_LIST_HEAD(&tn->dist_queue);
err = tipc_topsrv_start(net);
if (err)
goto out_subscr;