diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-12-13 11:24:49 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-12-13 11:49:29 +0300 |
| commit | b11919e1bb7f6f6273f5a33947b8496da2769eb8 (patch) | |
| tree | f2ff877b9b0363f8fc97f1c94316f763904ec41f /net/unix/af_unix.c | |
| parent | d1c722867f8022a27182b9a1d84e9bca75486c9a (diff) | |
| parent | e095493091e850d5292ad01d8fbf5cde1d89ac53 (diff) | |
| download | linux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the left-over fixes before the net-next pull-request.
net/mptcp/subflow.c
d3295fee3c75 ("mptcp: use proper req destructor for IPv6")
36b122baf6a8 ("mptcp: add subflow_v(4,6)_send_synack()")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index b3545fc68097..ede2b2a140a4 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -3738,6 +3738,7 @@ static int __init af_unix_init(void) rc = proto_register(&unix_stream_proto, 1); if (rc != 0) { pr_crit("%s: Cannot create unix_sock SLAB cache!\n", __func__); + proto_unregister(&unix_dgram_proto); goto out; } |