Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Aug 2020 12:29:23 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r364660 - stable/12/sys/compat/linux
Message-ID:  <202008241229.07OCTNqj021793@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Mon Aug 24 12:29:23 2020
New Revision: 364660
URL: https://svnweb.freebsd.org/changeset/base/364660

Log:
  MFC r357203:
  
  Add TCP_CORK support to linux(4).  This fixes one of the things Nginx
  trips over.
  
  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 12:26:49 2020	(r364659)
+++ stable/12/sys/compat/linux/linux_socket.c	Mon Aug 24 12:29:23 2020	(r364660)
@@ -401,6 +401,8 @@ linux_to_bsd_tcp_sockopt(int opt)
 		return (TCP_NODELAY);
 	case LINUX_TCP_MAXSEG:
 		return (TCP_MAXSEG);
+	case LINUX_TCP_CORK:
+		return (TCP_NOPUSH);
 	case LINUX_TCP_KEEPIDLE:
 		return (TCP_KEEPIDLE);
 	case LINUX_TCP_KEEPINTVL:

Modified: stable/12/sys/compat/linux/linux_socket.h
==============================================================================
--- stable/12/sys/compat/linux/linux_socket.h	Mon Aug 24 12:26:49 2020	(r364659)
+++ stable/12/sys/compat/linux/linux_socket.h	Mon Aug 24 12:29:23 2020	(r364660)
@@ -248,6 +248,7 @@ int linux_accept(struct thread *td, struct linux_accep
 
 #define	LINUX_TCP_NODELAY	1
 #define	LINUX_TCP_MAXSEG	2
+#define	LINUX_TCP_CORK		3
 #define	LINUX_TCP_KEEPIDLE	4
 #define	LINUX_TCP_KEEPINTVL	5
 #define	LINUX_TCP_KEEPCNT	6



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008241229.07OCTNqj021793>