usm: fixed merged conflicts (#20966)

DataDog · Nov 20, 2023 · ad3cf2e · ad3cf2e
1 parent e939ee9
commit ad3cf2e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)