projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2...
[firefly-linux-kernel-4.4.55.git]
/
net
/
vmw_vsock
/
vmci_transport.c
diff --git
a/net/vmw_vsock/vmci_transport.c
b/net/vmw_vsock/vmci_transport.c
index c294da095461bcf67f662d751d00d7156c092366..1f63daff39659e08561862cfd71220ffc6949291 100644
(file)
--- a/
net/vmw_vsock/vmci_transport.c
+++ b/
net/vmw_vsock/vmci_transport.c
@@
-1022,7
+1022,7
@@
static int vmci_transport_recv_listen(struct sock *sk,
}
pending = __vsock_create(sock_net(sk), NULL, sk, GFP_KERNEL,
- sk->sk_type);
+ sk->sk_type
, 0
);
if (!pending) {
vmci_transport_send_reset(sk, pkt);
return -ENOMEM;