From nobody Fri Jul 12 11:24:53 2024 X-Original-To: dev-commits-src-main@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 4WL8QG36zXz5QBbk; Fri, 12 Jul 2024 11:24:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WL8QF6qPCz4hqT; Fri, 12 Jul 2024 11:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720783494; 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=vA7E/nazFGbIEB7KYd5gw6cPfZhia4LJidE3Yvk+ALc=; b=I+iTcYQ0hUJ6I5iM1I0ATAh+gFktRONnwgmo0QWmfgmp0MpC5a78ynuX7RkHBbTeJ+OAlB mRuSJdlcMqyagHhFpzfJCFYOXSCngOWDn4HOHhKRu9mclFe4W8atZJMFJTdFEcRaeDLrn9 gskYByyrk2+Wal/n7K9ROdP6G7CK3Vzc/QMqeW0adpjYrLN4/GqfJFpUaz6E6K7fDcHb0z 7azbjVpVudfSnKrbKmTaixfVZVakiCcVCPJo3cpdrmzo6aG3ugL4OEwm8EA1Vtj0tA9oVp pgW36F9Np/GOTlKNlkJklAKA8L4ny69fI1dQwuCFKKOZsR6laJzQ/3fbUlt2pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720783494; a=rsa-sha256; cv=none; b=S2yYJlqefmoeRfkgf9loR1NL4gbpagL6qp0bKDiZLlH62DTpfbXEortUHXLOHOKT7rdl0V ENoGRPa4b6ZrHUhscK7DE5NkR3Istj92FV4SP22WoGeQFQRatD750Xi86CP0YqevzfkrMU Q6chWFFtX8yh52KIjER/f4o82ipAJ4YGvkfylEueY1yrpohbo62MZuluovbpBL4hSN9Pai aNv2qcVYytgvMNIJs2Q35paFJEfWx5vegvLGQIHsnoUIrw0iccGluL0aTJg3BoQ0jhzXfa Sz2hqueIT6CVPD5LqwHuYezSkmMo3JG0zPiqMCL3HwX1dR2Ngb54jwEfuRnSqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720783494; 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=vA7E/nazFGbIEB7KYd5gw6cPfZhia4LJidE3Yvk+ALc=; b=HlXVBuQBqg0j4Iq3lQjjvwW96SUgX43/HyUV1uszd2lv3UlSiaB88BS6rOU/adu3skt3nv UhIHz7lE8y2oFhGCWO14YCE8L3tiwXIOKKWLP4XAzwfhROfoNyQZDRqtXtE6PWJNrpfc0Y wMbI6WJKtbxog6Dz+DCgvgI/xlmSjxL7oTxpNjRRaA0HqVKHz/7R4AgnwV8QC20wJ4jGff qT/SYYk6X4lkzU/xC1a/ODv8gKIqJa5eHPLWDfBIbLrQIXaOgxEDqrsahXkMPuWLyvHqw5 JwqxWaEEyjbypiGHYk8gCt80o1DfH11l6QT3mZ07wPBFW6iLDr23Ur3p/TfIhA== 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 4WL8QF6R9LzhB4; Fri, 12 Jul 2024 11:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46CBOrlB092449; Fri, 12 Jul 2024 11:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46CBOrop092444; Fri, 12 Jul 2024 11:24:53 GMT (envelope-from git) Date: Fri, 12 Jul 2024 11:24:53 GMT Message-Id: <202407121124.46CBOrop092444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 41106f5aa032 - main - netipsec/xform_esp.c: make esp_ctr_compatibility global List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41106f5aa032502f474fb60180a97917b12f6568 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41106f5aa032502f474fb60180a97917b12f6568 commit 41106f5aa032502f474fb60180a97917b12f6568 Author: Konstantin Belousov AuthorDate: 2023-03-13 00:22:21 +0000 Commit: Konstantin Belousov CommitDate: 2024-07-12 03:29:31 +0000 netipsec/xform_esp.c: make esp_ctr_compatibility global Sponsored by: NVIDIA networking --- sys/netipsec/esp_var.h | 2 ++ sys/netipsec/xform_esp.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netipsec/esp_var.h b/sys/netipsec/esp_var.h index bbcea005fcf3..c1f492913107 100644 --- a/sys/netipsec/esp_var.h +++ b/sys/netipsec/esp_var.h @@ -74,6 +74,8 @@ struct espstat { #include VNET_DECLARE(int, esp_enable); +VNET_DECLARE(int, esp_ctr_compatibility); +#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility) VNET_PCPUSTAT_DECLARE(struct espstat, espstat); #define ESPSTAT_ADD(name, val) \ diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 7ad6085db87f..599134f056ca 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -83,8 +83,7 @@ #define SPI_SIZE 4 VNET_DEFINE(int, esp_enable) = 1; -VNET_DEFINE_STATIC(int, esp_ctr_compatibility) = 1; -#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility) +VNET_DEFINE(int, esp_ctr_compatibility) = 1; VNET_PCPUSTAT_DEFINE(struct espstat, espstat); VNET_PCPUSTAT_SYSINIT(espstat);