Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[~andy/linux] / net / tipc / socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index e36b4b5a5222320644fd1d7fe35c06bfe982e7f0..6b792265dc06e5b08085095178bd4fba3e427ff7 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -201,7 +201,7 @@ static int tipc_create(struct net *net, struct socket *sock, int protocol)
                return -EPROTOTYPE;
        }
 
-       sk = sk_alloc(net, AF_TIPC, GFP_KERNEL, &tipc_proto, 1);
+       sk = sk_alloc(net, AF_TIPC, GFP_KERNEL, &tipc_proto);
        if (!sk) {
                tipc_deleteport(ref);
                return -ENOMEM;