4f97275bc7
Upstream commit 1fa60003a8b8 made a change to headers that broke compiles for musl-libc based builds. Apply the patch slated to address the issue. Fixes: - http://autobuild.buildroot.net/results/eafd07dddfe7e8b714fc3fcaf77a2d7150694ee2/ Signed-off-by: Vincent Fazio <vfazio@xes-inc.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
72 lines
2.0 KiB
Diff
72 lines
2.0 KiB
Diff
From a26296eea68aa6c16b253f34825c9b9007269672 Mon Sep 17 00:00:00 2001
|
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Date: Sat, 14 Jan 2023 08:34:11 -0800
|
|
Subject: [PATCH] marvell.c: Fix build with musl-libc
|
|
|
|
After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped
|
|
including net/if.h which resolved the proper defines to pull in
|
|
sys/types.h and provide a definition for u_int32_t. With musl-libc we
|
|
would need to define _GNU_SOURCE to ensure that sys/types.h does provide a
|
|
definition for u_int32_t.
|
|
|
|
Rather, just replace u_uint{16,32}_t with the more standard
|
|
uint{16,32}_t types from stdint.h
|
|
|
|
Fixes: 1fa60003a8b8 ("misc: header includes cleanup")
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
|
|
[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-4-f.fainelli@gmail.com/]
|
|
Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
|
|
---
|
|
marvell.c | 34 +++++++++++++++++-----------------
|
|
1 file changed, 17 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/marvell.c b/marvell.c
|
|
index d3d570e..3f3aed8 100644
|
|
--- a/marvell.c
|
|
+++ b/marvell.c
|
|
@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p)
|
|
static void dump_queue(const char *name, const void *a, int rx)
|
|
{
|
|
struct desc {
|
|
- u_int32_t ctl;
|
|
- u_int32_t next;
|
|
- u_int32_t data_lo;
|
|
- u_int32_t data_hi;
|
|
- u_int32_t status;
|
|
- u_int32_t timestamp;
|
|
- u_int16_t csum2;
|
|
- u_int16_t csum1;
|
|
- u_int16_t csum2_start;
|
|
- u_int16_t csum1_start;
|
|
- u_int32_t addr_lo;
|
|
- u_int32_t addr_hi;
|
|
- u_int32_t count_lo;
|
|
- u_int32_t count_hi;
|
|
- u_int32_t byte_count;
|
|
- u_int32_t csr;
|
|
- u_int32_t flag;
|
|
+ uint32_t ctl;
|
|
+ uint32_t next;
|
|
+ uint32_t data_lo;
|
|
+ uint32_t data_hi;
|
|
+ uint32_t status;
|
|
+ uint32_t timestamp;
|
|
+ uint16_t csum2;
|
|
+ uint16_t csum1;
|
|
+ uint16_t csum2_start;
|
|
+ uint16_t csum1_start;
|
|
+ uint32_t addr_lo;
|
|
+ uint32_t addr_hi;
|
|
+ uint32_t count_lo;
|
|
+ uint32_t count_hi;
|
|
+ uint32_t byte_count;
|
|
+ uint32_t csr;
|
|
+ uint32_t flag;
|
|
};
|
|
const struct desc *d = a;
|
|
|
|
--
|
|
2.25.1
|
|
|