From 006941f2b1ba5b7f6871b17cac3e90fc51411685 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Sun, 25 Jun 2006 23:47:18 -0700 Subject: [PATCH] --- yaml --- r: 30408 b: refs/heads/master c: 499786516fc12791223f075d682a45ea1129eb04 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/socket.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f86593583d29..d31d4a5fb95e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1303e8f173a8a5000ee6e2fba876fec9474ed1f6 +refs/heads/master: 499786516fc12791223f075d682a45ea1129eb04 diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c index 8cefacb55aad..a1f22100a616 100644 --- a/trunk/net/tipc/socket.c +++ b/trunk/net/tipc/socket.c @@ -169,12 +169,6 @@ static int tipc_create(struct socket *sock, int protocol) struct sock *sk; u32 ref; - if ((sock->type != SOCK_STREAM) && - (sock->type != SOCK_SEQPACKET) && - (sock->type != SOCK_DGRAM) && - (sock->type != SOCK_RDM)) - return -EPROTOTYPE; - if (unlikely(protocol != 0)) return -EPROTONOSUPPORT; @@ -199,6 +193,9 @@ static int tipc_create(struct socket *sock, int protocol) sock->ops = &msg_ops; sock->state = SS_READY; break; + default: + tipc_deleteport(ref); + return -EPROTOTYPE; } sk = sk_alloc(AF_TIPC, GFP_KERNEL, &tipc_proto, 1);