diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-15 08:00:22 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-15 08:00:22 +0000 |
commit | 8ba94db1fe69019bb2d3b4f50fe9d1ccf3d94b3a (patch) | |
tree | 7487d237046db5ece113639b353f68cee3cad04e /sys-apps/ethtool/files | |
parent | 7b744169f910185aacfd39dbd71d58b58a2e1d2f (diff) |
gentoo auto-resync : 15:02:2023 - 08:00:21
Diffstat (limited to 'sys-apps/ethtool/files')
-rw-r--r-- | sys-apps/ethtool/files/ethtool-6.1-musl.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/sys-apps/ethtool/files/ethtool-6.1-musl.patch b/sys-apps/ethtool/files/ethtool-6.1-musl.patch new file mode 100644 index 000000000000..ed441a4511da --- /dev/null +++ b/sys-apps/ethtool/files/ethtool-6.1-musl.patch @@ -0,0 +1,64 @@ +https://bugs.gentoo.org/889402 +https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=41be533331fc3c6b711dbe532405782d3b8be5d1 + +From 41be533331fc3c6b711dbe532405782d3b8be5d1 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli <f.fainelli@gmail.com> +Date: Sat, 14 Jan 2023 08:34:11 -0800 +Subject: 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> +--- 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; + +-- +cgit |