patch-2.1.28 linux/net/core/sock.c

• Lines: 24
• Date: Mon Mar 3 09:37:44 1997
• Orig file: v2.1.27/linux/net/core/sock.c
• Orig date: Thu Feb 27 10:57:32 1997

diff -u --recursive --new-file v2.1.27/linux/net/core/sock.c linux/net/core/sock.c
@@ -328,17 +328,14 @@
 		
 		case SO_LINGER:	
 		  {
-		        int err;
 			len=min(len,sizeof(ling));
 			if (put_user(len, optlen)) 
-			if (!err) {
-				ling.l_onoff=sk->linger;
-				ling.l_linger=sk->lingertime;
-				err = copy_to_user(optval,&ling,len);
-				if (err)
-				    err = -EFAULT;
-			}
-			return err;
+				return -EFAULT;
+			ling.l_onoff=sk->linger;
+			ling.l_linger=sk->lingertime;
+			if (copy_to_user(optval,&ling,len))
+				return -EFAULT;
+			return 0;
 		  }
 		
 		case SO_BSDCOMPAT: