From owner-svn-src-head@freebsd.org  Tue Sep 24 20:11:56 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 35ED412FF1E;
 Tue, 24 Sep 2019 20:11:56 +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 46dC5S0hhRz3xJL;
 Tue, 24 Sep 2019 20:11:56 +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 EF5004BEC;
 Tue, 24 Sep 2019 20:11:55 +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 x8OKBthE008408;
 Tue, 24 Sep 2019 20:11:55 GMT (envelope-from rrs@FreeBSD.org)
Received: (from rrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8OKBtCn008407;
 Tue, 24 Sep 2019 20:11:55 GMT (envelope-from rrs@FreeBSD.org)
Message-Id: <201909242011.x8OKBtCn008407@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: Tue, 24 Sep 2019 20:11:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r352660 - head/sys/netinet/tcp_stacks
X-SVN-Group: head
X-SVN-Commit-Author: rrs
X-SVN-Commit-Paths: head/sys/netinet/tcp_stacks
X-SVN-Commit-Revision: 352660
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: Tue, 24 Sep 2019 20:11:56 -0000

Author: rrs
Date: Tue Sep 24 20:11:55 2019
New Revision: 352660
URL: https://svnweb.freebsd.org/changeset/base/352660

Log:
  don't call in_ratelmit detach when RATELIMIT is not
  compiled in the kernel.

Modified:
  head/sys/netinet/tcp_stacks/bbr.c

Modified: head/sys/netinet/tcp_stacks/bbr.c
==============================================================================
--- head/sys/netinet/tcp_stacks/bbr.c	Tue Sep 24 20:04:31 2019	(r352659)
+++ head/sys/netinet/tcp_stacks/bbr.c	Tue Sep 24 20:11:55 2019	(r352660)
@@ -14784,10 +14784,12 @@ bbr_set_sockopt(struct socket *so, struct sockopt *sop
 			bbr->bbr_attempt_hdwr_pace = 0;
 		} else {
 			bbr->bbr_hdw_pace_ena = 0;
+#ifdef RATELIMIT
 			if (bbr->bbr_hdrw_pacing) {
 				bbr->bbr_hdrw_pacing = 0;
 				in_pcbdetach_txrtlmt(bbr->rc_inp);
 			}
+#endif
 		}
 		break;