This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Sync with Linux 3.9
- From: "Carlos O'Donell" <carlos at redhat dot com>
- To: Andreas Jaeger <aj at suse dot com>
- Cc: libc-alpha <libc-alpha at sourceware dot org>
- Date: Fri, 03 May 2013 11:30:18 -0400
- Subject: Re: Sync with Linux 3.9
- References: <51838EA4 dot 9090804 at suse dot com>
On 05/03/2013 06:17 AM, Andreas Jaeger wrote:
>
> My review of the Linux 3.9 patch showed the following changes that
> should be added to glibc.
>
> Ok to commit?
>
> Andreas
>
> 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.
>
> diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
> index b62a696..b7bf9b3 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 */
OK.
>
> #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 eadd7d9..446bff8 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_FSOCK 40 /* vSockets. */
s/FSOCK/VSOCK/g
> +#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.
>
OK with those changes.
Cheers,
Carlos.