patch-2.2.15 linux/net/x25/af_x25.c

• Lines: 27
• Date: Fri Apr 21 12:47:17 2000
• Orig file: v2.2.14/net/x25/af_x25.c
• Orig date: Fri Aug 28 03:33:09 1998

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/net/x25/af_x25.c linux/net/x25/af_x25.c
@@ -16,6 +16,7 @@
  *	X.25 001	Jonathan Naylor	Started coding.
  *	X.25 002	Jonathan Naylor	Centralised disconnect handling.
  *					New timer architecture.
+ *	2000-11-03	Henner Eisen	MSG_EOR handling more POSIX compliant.
  */
 
 #include <linux/config.h>
@@ -854,7 +855,7 @@
 	unsigned char *asmptr;
 	int size, qbit = 0;
 
-	if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_OOB))
+	if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_OOB | MSG_EOR))
 		return -EINVAL;
 
 	if (sk->zapped)
@@ -1035,6 +1036,9 @@
 		copied = size;
 		msg->msg_flags |= MSG_TRUNC;
 	}
+
+	/* Currently, each datagram always contains a complete record */ 
+	msg->msg_flags |= MSG_EOR;
 
 	skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);