* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):

Define for Arm, PowerPC and SH if kernel is 2.4.4 or newer.
	* sysdeps/unix/sysv/linux/bits/socket.h (PF_WANPIPE): New, from
	Linux 2.4.4.
	(AF_WANPIPE): Likewise.
	(MSG_MORE): New.

	* sysdeps/unix/sysv/linux/alpha/bits/socket.h: Add same changes as
	for Linux generic version.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/socket.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise.
	* sysdeps/unix/sysv/linux/ia64/bits/socket.h: Likewise.

	* sysdeps/gnu/netinet/tcp.h (TCP_QUICKACK): New.

diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
index 076e332..87099ec 100644 (file)
--- a/sysdeps/gnu/netinet/tcp.h
+++ b/sysdeps/gnu/netinet/tcp.h
@@ -48,6 +48,7 @@
 #define TCP_DEFER_ACCEPT 9     /* Wake up listener only when data arrive */
 #define TCP_WINDOW_CLAMP 10    /* Bound advertised window */
 #define TCP_INFO        11     /* Information about this connection. */
+#define        TCP_QUICKACK     12     /* Bock/reenable quick ACKs.  */
 
 #ifdef __USE_MISC
 # include <sys/types.h>

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/socket.h b/sysdeps/unix/sysv/linux/alpha/bits/socket.h
index 8efdaca..cf8e5a1 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/socket.h
@@ -87,6 +87,7 @@ enum __socket_type
 #define        PF_SNA          22      /* Linux SNA Project */
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
+#define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -117,6 +118,7 @@ enum __socket_type
 #define        AF_SNA          PF_SNA
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
+#define        AF_WANPIPE      PF_WANPIPE
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.
@@ -199,8 +201,10 @@ enum
 #define        MSG_RST         MSG_RST
     MSG_ERRQUEUE       = 0x2000, /* Fetch message from error queue.  */
 #define        MSG_ERRQUEUE    MSG_ERRQUEUE
-    MSG_NOSIGNAL       = 0x4000  /* Do not generate SIGPIPE.  */
+    MSG_NOSIGNAL       = 0x4000, /* Do not generate SIGPIPE.  */
 #define        MSG_NOSIGNAL    MSG_NOSIGNAL
+    MSG_MORE           = 0x8000  /* Sender will send more.  */
+#define        MSG_MORE        MSG_MORE
   };
 
 

diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 3401220..c7a509a 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -87,6 +87,7 @@ enum __socket_type
 #define        PF_SNA          22      /* Linux SNA Project */
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
+#define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -117,6 +118,7 @@ enum __socket_type
 #define        AF_SNA          PF_SNA
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
+#define        AF_WANPIPE      PF_WANPIPE
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.
@@ -199,8 +201,10 @@ enum
 #define        MSG_RST         MSG_RST
     MSG_ERRQUEUE       = 0x2000, /* Fetch message from error queue.  */
 #define        MSG_ERRQUEUE    MSG_ERRQUEUE
-    MSG_NOSIGNAL       = 0x4000  /* Do not generate SIGPIPE.  */
+    MSG_NOSIGNAL       = 0x4000, /* Do not generate SIGPIPE.  */
 #define        MSG_NOSIGNAL    MSG_NOSIGNAL
+    MSG_MORE           = 0x8000  /* Sender will send more.  */
+#define        MSG_MORE        MSG_MORE
   };
 
 

diff --git a/sysdeps/unix/sysv/linux/ia64/bits/socket.h b/sysdeps/unix/sysv/linux/ia64/bits/socket.h
index 0b239fc..5f5fbaf 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/socket.h
@@ -87,6 +87,7 @@ enum __socket_type
 #define        PF_SNA          22      /* Linux SNA Project */
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
+#define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -117,6 +118,7 @@ enum __socket_type
 #define        AF_SNA          PF_SNA
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
+#define        AF_WANPIPE      PF_WANPIPE
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.
@@ -199,8 +201,10 @@ enum
 #define        MSG_RST         MSG_RST
     MSG_ERRQUEUE       = 0x2000, /* Fetch message from error queue.  */
 #define        MSG_ERRQUEUE    MSG_ERRQUEUE
-    MSG_NOSIGNAL       = 0x4000  /* Do not generate SIGPIPE.  */
+    MSG_NOSIGNAL       = 0x4000, /* Do not generate SIGPIPE.  */
 #define        MSG_NOSIGNAL    MSG_NOSIGNAL
+    MSG_MORE           = 0x8000  /* Sender will send more.  */
+#define        MSG_MORE        MSG_MORE
   };
 
 

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index f0311df..f4148aa 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -146,6 +146,13 @@
 # define __ASSUME_FCNTL64              1
 #endif
 
+/* Arm got fcntl64 in 2.4.4, PowerPC and SH have it also in 2.4.4 (I
+   don't know when it got introduced).  */
+#if __LINUX_KERNEL_VERSION >= 132100
+    && (defined __arm__ || defined __powerpc__ || defined __sh__)
+# define __ASSUME_FCNTL64              1
+#endif
+
 /* The getdents64 syscall was introduced in 2.4.0-test7.  We test for
    2.4.1 for the earliest version we know the syscall is available.  */
 #if __LINUX_KERNEL_VERSION >= 132097

diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h
index 2d6ded9..eaf8ccc 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h
@@ -87,6 +87,7 @@ enum __socket_type
 #define        PF_SNA          22      /* Linux SNA Project */
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
+#define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -117,6 +118,7 @@ enum __socket_type
 #define        AF_SNA          PF_SNA
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
+#define        AF_WANPIPE      PF_WANPIPE
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.
@@ -199,8 +201,10 @@ enum
 #define        MSG_RST         MSG_RST
     MSG_ERRQUEUE       = 0x2000, /* Fetch message from error queue.  */
 #define        MSG_ERRQUEUE    MSG_ERRQUEUE
-    MSG_NOSIGNAL       = 0x4000  /* Do not generate SIGPIPE.  */
+    MSG_NOSIGNAL       = 0x4000, /* Do not generate SIGPIPE.  */
 #define        MSG_NOSIGNAL    MSG_NOSIGNAL
+    MSG_MORE           = 0x8000  /* Sender will send more.  */
+#define        MSG_MORE        MSG_MORE
   };
 
 

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
index 5d683dc..1987be6 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
@@ -87,6 +87,7 @@ enum __socket_type
 #define        PF_SNA          22      /* Linux SNA Project */
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
+#define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -117,6 +118,7 @@ enum __socket_type
 #define        AF_SNA          PF_SNA
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
+#define        AF_WANPIPE      PF_WANPIPE
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.
@@ -199,8 +201,10 @@ enum
 #define        MSG_RST         MSG_RST
     MSG_ERRQUEUE       = 0x2000, /* Fetch message from error queue.  */
 #define        MSG_ERRQUEUE    MSG_ERRQUEUE
-    MSG_NOSIGNAL       = 0x4000  /* Do not generate SIGPIPE.  */
+    MSG_NOSIGNAL       = 0x4000, /* Do not generate SIGPIPE.  */
 #define        MSG_NOSIGNAL    MSG_NOSIGNAL
+    MSG_MORE           = 0x8000  /* Sender will send more.  */
+#define        MSG_MORE        MSG_MORE
   };