[v2,8/8] linux-user: define TARGET_SO_REUSEPORT

Message ID 20180516205543.29305-9-laurent@vivier.eu
State New
Headers show
Series
  • linux-user: move socket.h definitions to CPU directories
Related show

Commit Message

Laurent Vivier May 16, 2018, 8:55 p.m.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/alpha/sockbits.h   | 2 +-
 linux-user/generic/sockbits.h | 2 +-
 linux-user/mips/sockbits.h    | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

Comments

Philippe Mathieu-Daudé May 16, 2018, 11:18 p.m. | #1
On 05/16/2018 05:55 PM, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  linux-user/alpha/sockbits.h   | 2 +-
>  linux-user/generic/sockbits.h | 2 +-
>  linux-user/mips/sockbits.h    | 3 ---
>  3 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h
> index f5397dd875..d54dc98c09 100644
> --- a/linux-user/alpha/sockbits.h
> +++ b/linux-user/alpha/sockbits.h
> @@ -18,7 +18,7 @@
>  #define TARGET_SO_BROADCAST 0x0020
>  #define TARGET_SO_LINGER    0x0080
>  #define TARGET_SO_OOBINLINE 0x0100
> -/* To add :#define TARGET_SO_REUSEPORT 0x0200 */
> +#define TARGET_SO_REUSEPORT 0x0200
>  
>  #define TARGET_SO_TYPE      0x1008
>  #define TARGET_SO_ERROR 0x1007
> diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h
> index 5ad43eb0c8..c161f80626 100644
> --- a/linux-user/generic/sockbits.h
> +++ b/linux-user/generic/sockbits.h
> @@ -29,7 +29,7 @@
>  #define TARGET_SO_PRIORITY     12
>  #define TARGET_SO_LINGER       13
>  #define TARGET_SO_BSDCOMPAT    14
> -/* To add :#define TARGET_SO_REUSEPORT 15 */
> +#define TARGET_SO_REUSEPORT    15
>  #ifndef TARGET_SO_PASSCRED /* powerpc only differs in these */
>  #define TARGET_SO_PASSCRED     16
>  #define TARGET_SO_PEERCRED     17
> diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h
> index 370d13ed86..0f022cd598 100644
> --- a/linux-user/mips/sockbits.h
> +++ b/linux-user/mips/sockbits.h
> @@ -28,10 +28,7 @@
>                                          */
>  #define TARGET_SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.
>                                          */
> -#if 0
> -/* To add: Allow local address and port reuse. */
>  #define TARGET_SO_REUSEPORT 0x0200
> -#endif
>  
>  #define TARGET_SO_TYPE         0x1008  /* Compatible name for SO_STYLE. */
>  #define TARGET_SO_STYLE        SO_TYPE /* Synonym */
>

Patch

diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h
index f5397dd875..d54dc98c09 100644
--- a/linux-user/alpha/sockbits.h
+++ b/linux-user/alpha/sockbits.h
@@ -18,7 +18,7 @@ 
 #define TARGET_SO_BROADCAST 0x0020
 #define TARGET_SO_LINGER    0x0080
 #define TARGET_SO_OOBINLINE 0x0100
-/* To add :#define TARGET_SO_REUSEPORT 0x0200 */
+#define TARGET_SO_REUSEPORT 0x0200
 
 #define TARGET_SO_TYPE      0x1008
 #define TARGET_SO_ERROR 0x1007
diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h
index 5ad43eb0c8..c161f80626 100644
--- a/linux-user/generic/sockbits.h
+++ b/linux-user/generic/sockbits.h
@@ -29,7 +29,7 @@ 
 #define TARGET_SO_PRIORITY     12
 #define TARGET_SO_LINGER       13
 #define TARGET_SO_BSDCOMPAT    14
-/* To add :#define TARGET_SO_REUSEPORT 15 */
+#define TARGET_SO_REUSEPORT    15
 #ifndef TARGET_SO_PASSCRED /* powerpc only differs in these */
 #define TARGET_SO_PASSCRED     16
 #define TARGET_SO_PEERCRED     17
diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h
index 370d13ed86..0f022cd598 100644
--- a/linux-user/mips/sockbits.h
+++ b/linux-user/mips/sockbits.h
@@ -28,10 +28,7 @@ 
                                         */
 #define TARGET_SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.
                                         */
-#if 0
-/* To add: Allow local address and port reuse. */
 #define TARGET_SO_REUSEPORT 0x0200
-#endif
 
 #define TARGET_SO_TYPE         0x1008  /* Compatible name for SO_STYLE. */
 #define TARGET_SO_STYLE        SO_TYPE /* Synonym */