git: 41106f5aa032 - main - netipsec/xform_esp.c: make esp_ctr_compatibility global

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=41106f5aa032502f474fb60180a97917b12f6568

commit 41106f5aa032502f474fb60180a97917b12f6568
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-03-13 00:22:21 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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 <sys/counter.h>
 
 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);