# HG changeset patch
# User Kyle Moffett <mrmacman_g4@mac.com>
# Node ID 21deb8aeccd6530603232b4fcc4a34ecaad8ee88
# Parent  43cd2abd0f4c5d2e8ee4666d6bf1f0b96e252e54
Fix setsockopt locking bug

On Sparc, SO_DONTLINGER support resulted in sock_reset_flag being 
called without lock_sock().

Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>

diff -r 43cd2abd0f4c -r 21deb8aeccd6 net/core/sock.c
--- a/net/core/sock.c	Wed Jul 27 04:02:15 2005
+++ b/net/core/sock.c	Wed Jul 27 20:31:11 2005
@@ -206,13 +206,14 @@
 	 */
 
 #ifdef SO_DONTLINGER		/* Compatibility item... */
-	switch (optname) {
-		case SO_DONTLINGER:
-			sock_reset_flag(sk, SOCK_LINGER);
-			return 0;
-	}
-#endif	
-		
+	if (optname == SO_DONTLINGER) {
+		lock_sock(sk);
+		sock_reset_flag(sk, SOCK_LINGER);
+		release_sock(sk);
+		return 0;
+	}
+#endif
+	
   	if(optlen<sizeof(int))
   		return(-EINVAL);