From ad3cf2ec694361f4c23265566f5a3882b120a14b Mon Sep 17 00:00:00 2001 From: Guy Arbitman Date: Mon, 20 Nov 2023 19:58:35 +0200 Subject: [PATCH] usm: fixed merged conflicts (#20966) --- pkg/network/ebpf/c/protocols/http2/maps-defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/network/ebpf/c/protocols/http2/maps-defs.h b/pkg/network/ebpf/c/protocols/http2/maps-defs.h index cc60bcc056035..7e117cc221608 100644 --- a/pkg/network/ebpf/c/protocols/http2/maps-defs.h +++ b/pkg/network/ebpf/c/protocols/http2/maps-defs.h @@ -37,7 +37,7 @@ BPF_PERCPU_ARRAY_MAP(http2_stream_heap, http2_stream_t, 1) /* This map acts as a scratch buffer for "preparing" http2_event_t objects before they're enqueued. The primary motivation here is to save eBPF stack memory. */ -BPF_PERCPU_ARRAY_MAP(http2_scratch_buffer, __u32, http2_event_t, 1) +BPF_PERCPU_ARRAY_MAP(http2_scratch_buffer, http2_event_t, 1) /* Allocating a ctx on the heap, in order to save the ctx between the current stream. */ BPF_PERCPU_ARRAY_MAP(http2_ctx_heap, http2_ctx_t, 1)