diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:14:13 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:15:08 +0300 |
| commit | 537c2e91d3549e5d6020bb0576cf9b54a845255f (patch) | |
| tree | c09e8a1b7d733cde19b0c72678c28fb2bc97ff6b /include/trace/stages/stage2_data_offsets.h | |
| parent | 237bb5f7f7f55ec5f773469a974c61a49c298625 (diff) | |
| parent | cba9ffdb9913dfe6be29f049ce920ce451ce7cc4 (diff) | |
| download | linux-537c2e91d3549e5d6020bb0576cf9b54a845255f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/trace/stages/stage2_data_offsets.h')
| -rw-r--r-- | include/trace/stages/stage2_data_offsets.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/stages/stage2_data_offsets.h b/include/trace/stages/stage2_data_offsets.h index 469b6a64293d..8b0cff06d346 100644 --- a/include/trace/stages/stage2_data_offsets.h +++ b/include/trace/stages/stage2_data_offsets.h @@ -24,7 +24,7 @@ #define __array(type, item, len) #undef __dynamic_array -#define __dynamic_array(type, item, len) u32 item; +#define __dynamic_array(type, item, len) u32 item; const void *item##_ptr_; #undef __string #define __string(item, src) __dynamic_array(char, item, -1) @@ -45,7 +45,7 @@ #define __sockaddr(field, len) __dynamic_array(u8, field, len) #undef __rel_dynamic_array -#define __rel_dynamic_array(type, item, len) u32 item; +#define __rel_dynamic_array(type, item, len) u32 item; const void *item##_ptr_; #undef __rel_string #define __rel_string(item, src) __rel_dynamic_array(char, item, -1) |