From owner-svn-src-head@freebsd.org  Wed Sep 11 15:41:37 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 02102D7937;
 Wed, 11 Sep 2019 15:41:37 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46T5jX6HHFz44lK;
 Wed, 11 Sep 2019 15:41:36 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC4598A9D;
 Wed, 11 Sep 2019 15:41:36 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8BFfa88047553;
 Wed, 11 Sep 2019 15:41:36 GMT (envelope-from rrs@FreeBSD.org)
Received: (from rrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8BFfaRr047552;
 Wed, 11 Sep 2019 15:41:36 GMT (envelope-from rrs@FreeBSD.org)
Message-Id: <201909111541.x8BFfaRr047552@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rrs set sender to rrs@FreeBSD.org
 using -f
From: Randall Stewart <rrs@FreeBSD.org>
Date: Wed, 11 Sep 2019 15:41:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r352215 - head/sys/netinet
X-SVN-Group: head
X-SVN-Commit-Author: rrs
X-SVN-Commit-Paths: head/sys/netinet
X-SVN-Commit-Revision: 352215
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Sep 2019 15:41:37 -0000

Author: rrs
Date: Wed Sep 11 15:41:36 2019
New Revision: 352215
URL: https://svnweb.freebsd.org/changeset/base/352215

Log:
  With the recent commit of ktls, we no longer have a
  sb_tls_flags, its just the sb_flags. Also the ratelimit
  code, now that the defintion is in sockbuf.h, does not
  need the ktls.h file (or its predecessor).
  
  Sponsored by:	Netflix Inc

Modified:
  head/sys/netinet/tcp_ratelimit.c

Modified: head/sys/netinet/tcp_ratelimit.c
==============================================================================
--- head/sys/netinet/tcp_ratelimit.c	Wed Sep 11 15:39:28 2019	(r352214)
+++ head/sys/netinet/tcp_ratelimit.c	Wed Sep 11 15:41:36 2019	(r352215)
@@ -45,9 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#ifdef KERN_TLS
-#include <sys/sockbuf_tls.h>
-#endif
 #include <sys/sysctl.h>
 #include <sys/eventhandler.h>
 #include <sys/mutex.h>
@@ -1069,7 +1066,7 @@ tcp_set_pacing_rate(struct tcpcb *tp, struct ifnet *if
 			return (NULL);
 		}
 #ifdef KERN_TLS
-		if (tp->t_inpcb->inp_socket->so_snd.sb_tls_flags & SB_TLS_IFNET) {
+		if (tp->t_inpcb->inp_socket->so_snd.sb_flags & SB_TLS_IFNET) {
 			/*
 			 * We currently can't do both TLS and hardware
 			 * pacing