From nobody Thu Mar 23 21:29:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjJQ21FwRz40M0k; Thu, 23 Mar 2023 21:29:30 +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 4PjJQ20hkNz4GCD; Thu, 23 Mar 2023 21:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679606970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuDsEfqQ9Ql+IB+cf2tQWgOMQ3XHlwMOUD8t3qjE/Dc=; b=iWzfo6ZrBUb/Z1ITQ8A2B9Ahwj+Fa6UW3u6p1MR+sSvdYQu2EzSZku+CTQOjyZl9U2uyVZ JTYUJMA9KjdrhZhiYh5kB6ZU/GW1Ozx7CgFfs0ix10PS0zYOAHSJW58nVmNyayvryj+sLq wwAIZKN0P8R3Milb/BzppmLiqxwiN3memXmh9kYFofWPXLfvEU13AdmvVc6MLiuRIdoaLh CZgAS4y2/SLviFvXXWpzrd4YqPXuiwSKyzFIS8ExMCPck2ByvnADs4/cPKz7+dPDXryo9Q 9gnS8jPwWSPYIl4Py909lddMKIR5btKrcG5Tk7dG3//iBYP2wvWYCyR483nslg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679606970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuDsEfqQ9Ql+IB+cf2tQWgOMQ3XHlwMOUD8t3qjE/Dc=; b=bhnbxTMTQFZu4umhScmULh+/1ZrppVZR7bX6E88PVVTU1FKD2R4yfgyVPvJ9ZF0t9hammG 7msC35XGmUJ1mBZUVRDBI075BWITm2gayBY0PKrZmnnMe1D001nchi29Yeh3plzxBJn9xh 8XjjNdC0xV9YrLeREHYm+oLP24eFLMPNBDhHhLdVS+h+cIBeJ0WoeZjIGJgsFfUMFh0Xre D9W8msUosCxmOhpQxff56Ttb05nn/Dep5LmvUIRct/J+3DTKRrMmkPIeP9zdqExF+q22vX BdKzxOK2NxjKWM5/3KZC3wvjebWL9WitWEoKQorI/J4PhT9Vdq9ZOqmi7UUBSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679606970; a=rsa-sha256; cv=none; b=uhVhOHID3jjtyRLyiY9AsjVVAR8qPnqChQKhx1MsKgslqSpCCDKrcM5E8H7lxakMCtg8PN coovrxIS24qS5khspf4FVrhX+dduXTPgUsGLTVHnNULU+vr4M2M5e43SDwM6vCw7mnN8Iq LWYYJKcebjFF2WBbjnvXCfaboAF7i4JNeqmA8jtiU6ZAGRrCZBARuHzQ7OjWOpKjCg71cO XmU1qC0IL0SS4NPDWarbvg+o/tOmdWDZsFwJl3MAiMppkjtjmjQ/EKrP+sckkKWeI5JKCb aG97kY9ba1JHjzgxvhQXlWcEcT/JeCP/8SuKu6+DCw048IFQn8+fDQoW1xAkTg== 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 4PjJQ16Whmzrn0; Thu, 23 Mar 2023 21:29:29 +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 32NLTT4s070068; Thu, 23 Mar 2023 21:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NLTTCA070067; Thu, 23 Mar 2023 21:29:29 GMT (envelope-from git) Date: Thu, 23 Mar 2023 21:29:29 GMT Message-Id: <202303232129.32NLTTCA070067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d2dab20c2ade - main - ktls: Drop all the INET and INET6 compile-time guards. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2dab20c2ade644337430856248ccb54a0a543c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d2dab20c2ade644337430856248ccb54a0a543c4 commit d2dab20c2ade644337430856248ccb54a0a543c4 Author: John Baldwin AuthorDate: 2023-03-23 21:29:07 +0000 Commit: John Baldwin CommitDate: 2023-03-23 21:29:07 +0000 ktls: Drop all the INET and INET6 compile-time guards. Consistent with 9fd0d9b16e93ff2a3bd375a98763dca0150dcee0, KERN_TLS is not supported on kernels without any INET support. Reviewed by: gallatin, hselasky MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39232 --- sys/kern/uipc_ktls.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index c82864f379b8..4639355b1558 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -66,10 +66,8 @@ __FBSDID("$FreeBSD$"); #endif #include #include -#if defined(INET) || defined(INET6) #include #include -#endif #include #ifdef TCP_OFFLOAD #include @@ -302,14 +300,11 @@ SYSCTL_COUNTER_U64(_kern_ipc_tls_toe, OID_AUTO, chacha20, CTLFLAG_RD, static MALLOC_DEFINE(M_KTLS, "ktls", "Kernel TLS"); -#if defined(INET) || defined(INET6) static void ktls_reset_receive_tag(void *context, int pending); static void ktls_reset_send_tag(void *context, int pending); -#endif static void ktls_work_thread(void *ctx); static void ktls_alloc_thread(void *ctx); -#if defined(INET) || defined(INET6) static u_int ktls_get_cpu(struct socket *so) { @@ -340,7 +335,6 @@ ktls_get_cpu(struct socket *so) cpuid = ktls_cpuid_lookup[inp->inp_flowid % ktls_number_threads]; return (cpuid); } -#endif static int ktls_buffer_import(void *arg, void **store, int count, int domain, int flags) @@ -505,7 +499,6 @@ start: return (error); } -#if defined(INET) || defined(INET6) static int ktls_create_session(struct socket *so, struct tls_enable *en, struct ktls_session **tlsp, int direction) @@ -1826,7 +1819,6 @@ ktls_modify_txrtlmt(struct ktls_session *tls, uint64_t max_pacing_rate) return (mst->sw->snd_tag_modify(mst, ¶ms)); } #endif -#endif static void ktls_destroy_help(void *context, int pending __unused) @@ -3265,7 +3257,6 @@ ktls_work_thread(void *ctx) } } -#if defined(INET) || defined(INET6) static void ktls_disable_ifnet_help(void *context, int pending __unused) { @@ -3354,4 +3345,3 @@ ktls_disable_ifnet(void *arg) TASK_INIT(&tls->disable_ifnet_task, 0, ktls_disable_ifnet_help, tls); (void)taskqueue_enqueue(taskqueue_thread, &tls->disable_ifnet_task); } -#endif