diff options
| author | Andreas Jaeger <aj@suse.de> | 2013-05-03 20:51:27 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2013-05-03 20:52:00 +0200 |
| commit | 164fd39d05925717e75715929c7ced14a2c1505e (patch) | |
| tree | c7768040cd92e2257ad7a98ee82e4af34e397977 | |
| parent | 8237f48c907d849d50ce04e110c87adcab62f535 (diff) | |
| download | glibc-164fd39d05925717e75715929c7ced14a2c1505e.tar.gz glibc-164fd39d05925717e75715929c7ced14a2c1505e.tar.xz glibc-164fd39d05925717e75715929c7ced14a2c1505e.zip | |
Sync with Linux 3.9
* sysdeps/gnu/netinet/tcp.h (TCP_TIMESTAMP): New value, from Linux 3.9. * sysdeps/unix/sysv/linux/bits/socket.h (PF_VSOCK, AF_VSOCK): Add. (PF_MAX): Adjust for VSOCK change.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/gnu/netinet/tcp.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 9802e4e37e..0e4ce2f507 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-05-03 Andreas Jaeger <aj@suse.de> + + * sysdeps/gnu/netinet/tcp.h (TCP_TIMESTAMP): New value, from + Linux 3.9. + * sysdeps/unix/sysv/linux/bits/socket.h (PF_VSOCK, AF_VSOCK): Add. + (PF_MAX): Adjust for VSOCK change. + 2013-05-03 Adhemerval Zanella <azanella@linux.vnet.ibm.com> * sysdeps/powerpc/fpu/libm-test-ulps: Update. diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h index b62a696e5b..b7bf9b38d4 100644 --- a/sysdeps/gnu/netinet/tcp.h +++ b/sysdeps/gnu/netinet/tcp.h @@ -60,6 +60,7 @@ #define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue. */ #define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */ #define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ +#define TCP_TIMESTAMP 24 /* TCP time stamp */ #ifdef __USE_MISC # include <sys/types.h> diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index eadd7d9326..9312849d03 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -79,7 +79,8 @@ typedef __socklen_t socklen_t; #define PF_CAIF 37 /* CAIF sockets. */ #define PF_ALG 38 /* Algorithm sockets. */ #define PF_NFC 39 /* NFC sockets. */ -#define PF_MAX 40 /* For now.. */ +#define PF_VSOCK 40 /* vSockets. */ +#define PF_MAX 41 /* For now.. */ /* Address families. */ #define AF_UNSPEC PF_UNSPEC @@ -123,6 +124,7 @@ typedef __socklen_t socklen_t; #define AF_CAIF PF_CAIF #define AF_ALG PF_ALG #define AF_NFC PF_NFC +#define AF_VSOCK PF_VSOCK #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. |