summaryrefslogtreecommitdiffstats
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-05-17 12:15:49 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-05-17 12:15:49 +0200
commit9a652cc01e589e10e2aa341074ea240c9838102b (patch)
tree48ec31db7a09a0e6b7cca66ea08b20cc78f218cb /net/tipc/core.c
parente8fcdf1e65c71340972041295fb7b3e59929b761 (diff)
parent99ee87295017e36abb6925e6139ca303cb55aee7 (diff)
downloadtalos-op-linux-9a652cc01e589e10e2aa341074ea240c9838102b.tar.gz
talos-op-linux-9a652cc01e589e10e2aa341074ea240c9838102b.zip
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge request by Jani to get at commit 249c4f538b1aae55d41699f8bafc6cb762a7f48f Author: Deepak M <m.deepak@intel.com> Date: Wed Mar 30 17:03:39 2016 +0300 drm: Add new DCS commands in the enum list Some simple conflicts in intel_dp.c. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
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;
OpenPOWER on IntegriCloud