patch-1.3.38 linux/net/core/datagram.c

Next file: linux/net/core/dev.c
Previous file: linux/net/ax25/af_ax25.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.37/linux/net/core/datagram.c linux/net/core/datagram.c
@@ -74,9 +74,7 @@
 		if(sk->err)
 		{
 			release_sock(sk);
-			cli();
-			*err=-sk->err;
-			sk->err=0;
+			*err=sock_error(sk);
 			restore_flags(intflags);
 			return NULL;
 		}
@@ -115,8 +113,7 @@
 						   eg an icmp sent earlier by the
 						   peer has finally turned up now */
 			{
-				*err = -sk->err;
-				sk->err=0;
+				*err = sock_error(sk);
 				restore_flags(intflags);
 				return NULL;
 			}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this