From 4fe5361cbe6da587ebd66469f3e611d94a186892 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Sun, 28 Jun 2020 18:56:32 +0000 Subject: [PATCH] Make linux(4) support SO_PROTOCOL. Running Python test suite with python3.8 from Focal triggers those. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25491 --- sys/compat/linux/linux_socket.c | 2 ++ sys/compat/linux/linux_socket.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index bb4af573f321..0b6c51a29423 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -236,6 +236,8 @@ linux_to_bsd_so_sockopt(int opt) return (SO_TIMESTAMP); case LINUX_SO_ACCEPTCONN: return (SO_ACCEPTCONN); + case LINUX_SO_PROTOCOL: + return (SO_PROTOCOL); } return (-1); } diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 82008e09dcef..88ecfb819133 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -197,6 +197,7 @@ int linux_accept(struct thread *td, struct linux_accept_args *args); #define LINUX_SO_ACCEPTCONN 30 #define LINUX_SO_SNDBUFFORCE 32 #define LINUX_SO_RCVBUFFORCE 33 +#define LINUX_SO_PROTOCOL 38 /* Socket options */ #define LINUX_IP_TOS 1