patch-2.2.18 linux/net/socket.c

• Lines: 26
• Date: Sat Sep 23 13:20:51 2000
• Orig file: v2.2.17/net/socket.c
• Orig date: Fri Apr 21 12:47:17 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/net/socket.c linux/net/socket.c
@@ -579,7 +579,7 @@
 	 *	Check protocol is in range
 	 */
 	if(family<0||family>=NPROTO)
-		return -EINVAL;
+		return -EAFNOSUPPORT;
 		
 #if defined(CONFIG_KMOD) && defined(CONFIG_NET)
 	/* Attempt to load a protocol module if the find failed. 
@@ -597,7 +597,7 @@
 #endif
 
 	if (net_families[family]==NULL)
-		return -EINVAL;
+		return -EAFNOSUPPORT;
 
 /*
  *	Check that this is a type that we know how to manipulate and
@@ -1165,7 +1165,6 @@
 			/* Note - when this code becomes multithreaded on
 			 * SMP machines you have a race to fix here.
 			 */
-			err = -ENOBUFS;
 			ctl_buf = sock_kmalloc(sock->sk, ctl_len, GFP_KERNEL);
 			if (ctl_buf == NULL) 
 				goto out_freeiov;