Synch with Linux 2.4.5:

* sysdeps/unix/sysv/linux/sparc/bits/socket.h (PF_BLUETOOTH):
New.
(AF_BLUETOOTH): New.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h
	(PF_BLUETOOTH): New.
	(AF_BLUETOOTH): New.

	* sysdeps/unix/sysv/linux/mips/bits/socket.h (AF_BLUETOOTH): New.
	(PF_BLUETOOTH): New.

	* sysdeps/unix/sysv/linux/ia64/bits/socket.h (AF_BLUETOOTH): New.
	(PF_BLUETOOTH): New.

	* sysdeps/unix/sysv/linux/alpha/bits/socket.h (PF_BLUETOOTH): New.
	(AF_BLUETOOTH): New.

	* sysdeps/unix/sysv/linux/bits/socket.h (PF_BLUETOOTH): New.
	(AF_BLUETOOTH): New.

	* sysdeps/unix/sysv/linux/net/if_arp.h (ARPHRD_IEEE80211): New.

	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h (N_HCI): New.

	* sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h (N_HCI): New.

	* sysdeps/unix/sysv/linux/bits/ioctl-types.h (N_HCI): New.

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/socket.h b/sysdeps/unix/sysv/linux/alpha/bits/socket.h
index cf8e5a1b0a23839c9d7be0b6439221e9e270e666..a5c7e95d3c19a504c354635b481f2dd34eaefacd 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/socket.h
@@ -88,6 +88,7 @@ enum __socket_type
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
 #define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
+#define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -119,6 +120,7 @@ enum __socket_type
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
 #define        AF_WANPIPE      PF_WANPIPE
+#define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/bits/ioctl-types.h b/sysdeps/unix/sysv/linux/bits/ioctl-types.h
index 59c79df812201add077666d0e274e0dd1143e7f1..45d3ba2ca6ae198742231c6c1c4b14f37eb77a64 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/ioctl-types.h
+++ b/sysdeps/unix/sysv/linux/bits/ioctl-types.h
@@ -1,5 +1,5 @@
 /* Structure types for pre-termios terminal ioctls.  Linux version.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -75,3 +75,4 @@ struct termio
 #define N_SMSBLOCK     12      /* SMS block mode  */
 #define N_HDLC         13      /* synchronous HDLC  */
 #define N_SYNC_PPP     14      /* synchronous PPP  */
+#define        N_HCI           15      /* Bluetooth HCI UART  */

diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index c7a509a920f7fc3a943635476c5b085b97e24ca0..7d090559b942b8d09125ecbfe056dc5508b04c3e 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -88,6 +88,7 @@ enum __socket_type
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
 #define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
+#define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -119,6 +120,7 @@ enum __socket_type
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
 #define        AF_WANPIPE      PF_WANPIPE
+#define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/ia64/bits/socket.h b/sysdeps/unix/sysv/linux/ia64/bits/socket.h
index 5f5fbafd860c7435cc5daf6b0d38905a2c192462..9e3fe627237389a76d1bc35c4ed7a540f3809a61 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/socket.h
@@ -88,6 +88,7 @@ enum __socket_type
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
 #define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
+#define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -119,6 +120,7 @@ enum __socket_type
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
 #define        AF_WANPIPE      PF_WANPIPE
+#define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h
index 573f9e7ca357fea68992a55e81d40b660632650c..e40a0ad96e9ddb44ea4ecfe6a5b858d89b47b883 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h
@@ -1,5 +1,5 @@
 /* Structure types for pre-termios terminal ioctls.  Linux/MIPS version.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -73,3 +73,4 @@ struct termio
 #define N_SMSBLOCK     12      /* SMS block mode  */
 #define N_HDLC         13      /* synchronous HDLC  */
 #define N_SYNC_PPP     14      /* synchronous PPP  */
+#define        N_HCI           15      /* Bluetooth HCI UART  */

diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h
index eaf8ccc3d29d48d70f0921000cb9c65d2466cf9c..9e38d288b76b06796eac46ac0523c698a21577ab 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h
@@ -88,6 +88,7 @@ enum __socket_type
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
 #define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
+#define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -119,6 +120,7 @@ enum __socket_type
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
 #define        AF_WANPIPE      PF_WANPIPE
+#define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h
index 5625030ff5fbe28baf8c38cdcba58b9597a241b6..23b51e071cb208e2acba9082cc33d87b5fb0d3d0 100644 (file)
--- a/sysdeps/unix/sysv/linux/net/if_arp.h
+++ b/sysdeps/unix/sysv/linux/net/if_arp.h
@@ -122,7 +122,7 @@ struct arphdr
 #define ARPHRD_FCPL    786             /* Fibrechanel public loop.  */
 #define ARPHRD_FCPFABRIC 787           /* Fibrechanel fabric.  */
 #define ARPHRD_IEEE802_TR 800          /* Magic type ident for TR.  */
-
+#define ARPHRD_IEEE80211 801           /* IEEE 802.11.  */
 
 /* ARP ioctl request.  */
 struct arpreq

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
index 85bd16203f8f4e40039f934f75d09f444e084fb1..a445fa692b884e1a4ba708e88c09c24f30dc754b 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
@@ -43,9 +43,9 @@ struct termios {
 };
 
 /* c_cc characters */
-#define VINTR  0
-#define VQUIT  1
-#define VERASE         2
+#define VINTR  0
+#define VQUIT  1
+#define VERASE 2
 #define VKILL  3
 #define VEOF   4
 #define VMIN   5
@@ -54,9 +54,9 @@ struct termios {
 #define VEOL2  8
 #define VSWTC  9
 
-#define VWERASE        10
+#define VWERASE        10
 #define VREPRINT       11
-#define VSUSP          12
+#define VSUSP          12
 #define VSTART         13
 #define VSTOP          14
 #define VLNEXT         15
@@ -297,3 +297,4 @@ struct termio {
 #define N_SMSBLOCK     12      /* SMS block mode  */
 #define N_HDLC         13      /* synchronous HDLC  */
 #define N_SYNC_PPP     14      /* synchronous PPP  */
+#define        N_HCI           15      /* Bluetooth HCI UART  */

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h b/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h
index 52ae120f8bab12c5e9816742ed44bd02d179f711..a255d26ffc71faa02d80e6b9dd949361e6c40d59 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h
@@ -88,6 +88,7 @@ enum __socket_type
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
 #define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
+#define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -119,6 +120,7 @@ enum __socket_type
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
 #define        AF_WANPIPE      PF_WANPIPE
+#define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
index 1987be6e25b3fa8ac2c2aa7163be04e7d37a937a..d22f528f99315f8a59ecce2e0d4f2fe3439109ec 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
@@ -88,6 +88,7 @@ enum __socket_type
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
 #define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
+#define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_MAX          32      /* For now..  */
 
 /* Address families.  */
@@ -119,6 +120,7 @@ enum __socket_type
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
 #define        AF_WANPIPE      PF_WANPIPE
+#define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.