From cc086693808c007679f02d5e0ee592446bf1b386 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sun, 13 Aug 2017 22:47:42 +0200 Subject: [PATCH] add SIOCGSTAMPNS socket ioctl macro to ioctl.h it is defined in linux asm/sockios.h since commit ae40eb1ef30ab4120bd3c8b7e3da99ee53d27a23 (linux v2.6.22) but was missing from musl by accident. in musl the sockios macros are exposed in sys/ioctl.h together with other ioctl requests instead of in sys/socket.h because of namespace rules. (glibc has them in sys/socket.h under _GNU_SOURCE.) --- arch/generic/bits/ioctl.h | 1 + arch/mips/bits/ioctl.h | 1 + arch/mips64/bits/ioctl.h | 1 + arch/mipsn32/bits/ioctl.h | 1 + arch/powerpc/bits/ioctl.h | 1 + arch/powerpc64/bits/ioctl.h | 1 + arch/s390x/bits/ioctl.h | 1 + arch/sh/bits/ioctl.h | 1 + 8 files changed, 8 insertions(+) diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h index c2035fc5..44deb11a 100644 --- a/arch/generic/bits/ioctl.h +++ b/arch/generic/bits/ioctl.h @@ -137,6 +137,7 @@ struct winsize { #define SIOCGPGRP 0x8904 #define SIOCATMARK 0x8905 #define SIOCGSTAMP 0x8906 +#define SIOCGSTAMPNS 0x8907 #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h index 793c66ee..71394449 100644 --- a/arch/mips/bits/ioctl.h +++ b/arch/mips/bits/ioctl.h @@ -145,6 +145,7 @@ struct winsize { #define SIOCSPGRP _IOW('s', 8, pid_t) #define SIOCGPGRP _IOR('s', 9, pid_t) #define SIOCGSTAMP 0x8906 +#define SIOCGSTAMPNS 0x8907 #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h index 793c66ee..71394449 100644 --- a/arch/mips64/bits/ioctl.h +++ b/arch/mips64/bits/ioctl.h @@ -145,6 +145,7 @@ struct winsize { #define SIOCSPGRP _IOW('s', 8, pid_t) #define SIOCGPGRP _IOR('s', 9, pid_t) #define SIOCGSTAMP 0x8906 +#define SIOCGSTAMPNS 0x8907 #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h index 793c66ee..71394449 100644 --- a/arch/mipsn32/bits/ioctl.h +++ b/arch/mipsn32/bits/ioctl.h @@ -145,6 +145,7 @@ struct winsize { #define SIOCSPGRP _IOW('s', 8, pid_t) #define SIOCGPGRP _IOR('s', 9, pid_t) #define SIOCGSTAMP 0x8906 +#define SIOCGSTAMPNS 0x8907 #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h index 6d49cf4e..d3771dd3 100644 --- a/arch/powerpc/bits/ioctl.h +++ b/arch/powerpc/bits/ioctl.h @@ -150,6 +150,7 @@ struct winsize { #define SIOCGPGRP 0x8904 #define SIOCATMARK 0x8905 #define SIOCGSTAMP 0x8906 +#define SIOCGSTAMPNS 0x8907 #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h index 6d49cf4e..d3771dd3 100644 --- a/arch/powerpc64/bits/ioctl.h +++ b/arch/powerpc64/bits/ioctl.h @@ -150,6 +150,7 @@ struct winsize { #define SIOCGPGRP 0x8904 #define SIOCATMARK 0x8905 #define SIOCGSTAMP 0x8906 +#define SIOCGSTAMPNS 0x8907 #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C diff --git a/arch/s390x/bits/ioctl.h b/arch/s390x/bits/ioctl.h index 11196e15..0ebac590 100644 --- a/arch/s390x/bits/ioctl.h +++ b/arch/s390x/bits/ioctl.h @@ -131,6 +131,7 @@ struct winsize { #define SIOCGPGRP 0x8904 #define SIOCATMARK 0x8905 #define SIOCGSTAMP 0x8906 +#define SIOCGSTAMPNS 0x8907 #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h index e6e7d344..15256c51 100644 --- a/arch/sh/bits/ioctl.h +++ b/arch/sh/bits/ioctl.h @@ -141,6 +141,7 @@ struct winsize { #define SIOCSPGRP _IOW('s', 8, int) #define SIOCGPGRP _IOW('s', 9, int) #define SIOCGSTAMP _IOR('s', 100, char[8]) +#define SIOCGSTAMPNS _IOR('s', 101, char[8]) #define SIOCADDRT 0x890B #define SIOCDELRT 0x890C -- 2.25.1