summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h6
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/socket.h6
3 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c7edf32bf..f3b2e0cc15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-13  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/bits/socket.h (PF_PPPOX): New, from
+	Linux 2.3.99pre7.
+	(AF_PPPOX): Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/socket.h (PF_PPPOX): Likewise.
+	(AF_PPPOX): Likewise.
+
 2000-05-12  Andreas Jaeger  <aj@suse.de>
 
 	* inet/netinet/in.h (IN6_ARE_ADDR_EQUAL): Correct indices.
@@ -12,11 +20,11 @@
 
 2000-05-10  Jakub Jelinek  <jakub@redhat.com>
 
- 	* elf/dl-reloc.c (_dl_reloc_bad_type): Sync messages with plt
- 	argument.
- 	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handle
- 	R_SPARC_UA64.
- 	* sysdeps/unix/sysv/linux/sparc/sparc64/time.c: New file.
+	* elf/dl-reloc.c (_dl_reloc_bad_type): Sync messages with plt
+	argument.
+	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handle
+	R_SPARC_UA64.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/time.c: New file.
 
 2000-05-10  Jakub Jelinek  <jakub@redhat.com>
 
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 9dd8a80918..bd3dd9f4f6 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -85,7 +85,8 @@ enum __socket_type
 #define	PF_ECONET	19	/* Acorn Econet.  */
 #define	PF_ATMSVC	20	/* ATM SVCs.  */
 #define	PF_SNA		22	/* Linux SNA Project */
-#define PF_IRDA		23	/* IRDA sockets.  */
+#define	PF_IRDA		23	/* IRDA sockets.  */
+#define	PF_PPPOX	24	/* PPPoX sockets.  */
 #define	PF_MAX		32	/* For now..  */
 
 /* Address families.  */
@@ -114,7 +115,8 @@ enum __socket_type
 #define	AF_ECONET	PF_ECONET
 #define	AF_ATMSVC	PF_ATMSVC
 #define	AF_SNA		PF_SNA
-#define AF_IRDA		PF_IRDA
+#define	AF_IRDA		PF_IRDA
+#define	AF_PPPOX	PF_PPPOX
 #define	AF_MAX		PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.
diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h
index 1462331ff7..299215aee7 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h
@@ -85,7 +85,8 @@ enum __socket_type
 #define	PF_ECONET	19	/* Acorn Econet.  */
 #define	PF_ATMSVC	20	/* ATM SVCs.  */
 #define	PF_SNA		22	/* Linux SNA Project */
-#define 	PF_IRDA		23	/* IRDA sockets.  */
+#define	PF_IRDA		23	/* IRDA sockets.  */
+#define	PF_PPPOX	24	/* PPPoX sockets.  */
 #define	PF_MAX		32	/* For now..  */
 
 /* Address families.  */
@@ -114,7 +115,8 @@ enum __socket_type
 #define	AF_ECONET	PF_ECONET
 #define	AF_ATMSVC	PF_ATMSVC
 #define	AF_SNA		PF_SNA
-#define 	AF_IRDA		PF_IRDA
+#define	AF_IRDA		PF_IRDA
+#define	AF_PPPOX	PF_PPPOX
 #define	AF_MAX		PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.