[TIPC]: Improved performance of error checking during socket creation.

Signed-off-by: Allan Stephens <[email protected]> Signed-off-by: Per Liden <[email protected]> Signed-off-by: David S. Miller <[email protected]>
chewitt · Jun 26, 2006 · 4997865 · 4997865
1 parent 1303e8f
commit 4997865
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/net/tipc/socket.c b/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);