From owner-dev-commits-src-all@freebsd.org Wed Jul 7 19:08:44 2021 Return-Path: Delivered-To: dev-commits-src-all@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 8784365B495; Wed, 7 Jul 2021 19:08:44 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GKpqc3TP7z4mSS; Wed, 7 Jul 2021 19:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FBC5128CF; Wed, 7 Jul 2021 19:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 167J8iDf073954; Wed, 7 Jul 2021 19:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 167J8iXL073953; Wed, 7 Jul 2021 19:08:44 GMT (envelope-from git) Date: Wed, 7 Jul 2021 19:08:44 GMT Message-Id: <202107071908.167J8iXL073953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 0756bdf19c5c - main - ktls: make ktls_disable_ifnet() shim static MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0756bdf19c5c97fabf4090e844f8df9505fbd566 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jul 2021 19:08:44 -0000 The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=0756bdf19c5c97fabf4090e844f8df9505fbd566 commit 0756bdf19c5c97fabf4090e844f8df9505fbd566 Author: Andrew Gallatin AuthorDate: 2021-07-07 19:05:49 +0000 Commit: Andrew Gallatin CommitDate: 2021-07-07 19:08:13 +0000 ktls: make ktls_disable_ifnet() shim static A user reported that when compiling without KERN_TLS, and with -O0, the kernel failed to link due to ktls_disable_ifnet() being undefined. Making the shim static works around this issue. Reported by: Gary Jennejohn Sponsored by: Netflix --- sys/sys/ktls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h index 7fd8831878b4..a4156eb10395 100644 --- a/sys/sys/ktls.h +++ b/sys/sys/ktls.h @@ -238,7 +238,7 @@ extern unsigned int ktls_ifnet_max_rexmit_pct; void ktls_disable_ifnet(void *arg); #else #define ktls_ifnet_max_rexmit_pct 1 -inline void +static inline void ktls_disable_ifnet(void *arg __unused) { }