Skip to content

Commit

Permalink
Synch with Linux 2.4.5:
Browse files Browse the repository at this point in the history 
* 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.
  • Loading branch information
Andreas Jaeger committed Jul 5, 2001
1 parent 90f9eba commit b3339de
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 8 deletions.
2 changes: 2 additions & 0 deletions sysdeps/unix/sysv/linux/alpha/bits/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/bits/ioctl-types.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 */
2 changes: 2 additions & 0 deletions sysdeps/unix/sysv/linux/bits/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions sysdeps/unix/sysv/linux/ia64/bits/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 */
2 changes: 2 additions & 0 deletions sysdeps/unix/sysv/linux/mips/bits/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/net/if_arp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions sysdeps/unix/sysv/linux/powerpc/bits/termios.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 */
2 changes: 2 additions & 0 deletions sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions sysdeps/unix/sysv/linux/sparc/bits/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit b3339de

Please sign in to comment.