svn commit: r364705 - stable/12/sys/compat/linux

[Edward Tomasz Napierala]

Author: trasz
Date: Mon Aug 24 16:23:27 2020
New Revision: 364705
URL: https://svnweb.freebsd.org/changeset/base/364705

Log:
  MFC r362735:
  
  Make linux(4) support SO_PROTOCOL.  Running Python test suite
  with python3.8 from Focal triggers those.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/sys/compat/linux/linux_socket.c
  stable/12/sys/compat/linux/linux_socket.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/12/sys/compat/linux/linux_socket.c	Mon Aug 24 16:21:03 2020	(r364704)
+++ stable/12/sys/compat/linux/linux_socket.c	Mon Aug 24 16:23:27 2020	(r364705)
@@ -235,6 +235,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);
 }

Modified: stable/12/sys/compat/linux/linux_socket.h
==============================================================================
--- stable/12/sys/compat/linux/linux_socket.h	Mon Aug 24 16:21:03 2020	(r364704)
+++ stable/12/sys/compat/linux/linux_socket.h	Mon Aug 24 16:23:27 2020	(r364705)
@@ -199,6 +199,7 @@ int linux_accept(struct thread *td, struct linux_accep
 #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