diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
commit | ae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch) | |
tree | 223f50677aa00eb6f2a6529099a1005c7e43c071 /net/tipc/socket.c | |
parent | c84b82dd3e593db217f23c60f7edae02c76a3c4c (diff) | |
parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) |
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index dd8537f988c4..83ae41d7e554 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -485,9 +485,8 @@ static int tipc_sk_create(struct net *net, struct socket *sock, | |||
485 | tsk_set_unreturnable(tsk, true); | 485 | tsk_set_unreturnable(tsk, true); |
486 | if (sock->type == SOCK_DGRAM) | 486 | if (sock->type == SOCK_DGRAM) |
487 | tsk_set_unreliable(tsk, true); | 487 | tsk_set_unreliable(tsk, true); |
488 | __skb_queue_head_init(&tsk->mc_method.deferredq); | ||
489 | } | 488 | } |
490 | 489 | __skb_queue_head_init(&tsk->mc_method.deferredq); | |
491 | trace_tipc_sk_create(sk, NULL, TIPC_DUMP_NONE, " "); | 490 | trace_tipc_sk_create(sk, NULL, TIPC_DUMP_NONE, " "); |
492 | return 0; | 491 | return 0; |
493 | } | 492 | } |