Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

drivers/net/pppox.c

@@ -149,11 +149,8 @@ static int pppox_create(struct socket *sock, int protocol)
 		goto out;
 
 	rc = -EPROTONOSUPPORT;
-	if (!pppox_protos[protocol])
-		goto out;
-
-	rc = -EBUSY;
-	if (!try_module_get(pppox_protos[protocol]->owner))
+	if (!pppox_protos[protocol] ||
+	    !try_module_get(pppox_protos[protocol]->owner))
 		goto out;
 
 	rc = pppox_protos[protocol]->create(sock);

net/socket.c

@@ -1091,7 +1091,7 @@ int sock_create(int family, int type, int protocol, struct socket **res)
 
 	sock->type  = type;
 
-	i = -EBUSY;
+	i = -EAFNOSUPPORT;
 	if (!net_family_get(family))
 		goto out_release;
 
@@ -1288,7 +1288,7 @@ asmlinkage long sys_accept(int fd, struct sockaddr *upeer_sockaddr, int *upeer_a
 	if (err)
 		goto out_release;
 
-	err = -EBUSY;
+	err = -EAFNOSUPPORT;
 	if (!net_family_get(sock->ops->family))
 		goto out_release;