diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-03-09 16:19:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-11 00:08:40 +0000 |
commit | 356c9931303917e82f162bb13ad317174edb047b (patch) | |
tree | ca9d1fa81640321a12cf3092a4b0ec562b96bc49 /meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch | |
parent | 82fd20bf43e384a855e259fcc6ad598a13a702df (diff) | |
download | poky-356c9931303917e82f162bb13ad317174edb047b.tar.gz |
ethtool: update 6.1 -> 6.2
Drop patch merged upstream.
(From OE-Core rev: ae0e692476b9564aa0a64f65d2abfdc0e55ef23b)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch')
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch b/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch deleted file mode 100644 index 8a7eeafb9c..0000000000 --- a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From 5112785191e3279c671a027fe797be77e1071ecd Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 2 Jan 2023 13:45:46 +0100 | ||
4 | Subject: [PATCH] marvell.c: use portable integer types | ||
5 | |||
6 | u_int32_t is not portable, but uint32_t is. | ||
7 | |||
8 | Upstream-Status: Submitted [by email to mkubecek@suse.cz] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | |||
11 | --- | ||
12 | marvell.c | 34 +++++++++++++++++----------------- | ||
13 | 1 file changed, 17 insertions(+), 17 deletions(-) | ||
14 | |||
15 | diff --git a/marvell.c b/marvell.c | ||
16 | index d3d570e..3d42eed 100644 | ||
17 | --- a/marvell.c | ||
18 | +++ b/marvell.c | ||
19 | @@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) | ||
20 | static void dump_queue(const char *name, const void *a, int rx) | ||
21 | { | ||
22 | struct desc { | ||
23 | - u_int32_t ctl; | ||
24 | - u_int32_t next; | ||
25 | - u_int32_t data_lo; | ||
26 | - u_int32_t data_hi; | ||
27 | - u_int32_t status; | ||
28 | - u_int32_t timestamp; | ||
29 | - u_int16_t csum2; | ||
30 | - u_int16_t csum1; | ||
31 | - u_int16_t csum2_start; | ||
32 | - u_int16_t csum1_start; | ||
33 | - u_int32_t addr_lo; | ||
34 | - u_int32_t addr_hi; | ||
35 | - u_int32_t count_lo; | ||
36 | - u_int32_t count_hi; | ||
37 | - u_int32_t byte_count; | ||
38 | - u_int32_t csr; | ||
39 | - u_int32_t flag; | ||
40 | + uint32_t ctl; | ||
41 | + uint32_t next; | ||
42 | + uint32_t data_lo; | ||
43 | + uint32_t data_hi; | ||
44 | + uint32_t status; | ||
45 | + uint32_t timestamp; | ||
46 | + uint16_t csum2; | ||
47 | + uint16_t csum1; | ||
48 | + uint16_t csum2_start; | ||
49 | + uint16_t csum1_start; | ||
50 | + uint32_t addr_lo; | ||
51 | + uint32_t addr_hi; | ||
52 | + uint32_t count_lo; | ||
53 | + uint32_t count_hi; | ||
54 | + uint32_t byte_count; | ||
55 | + uint32_t csr; | ||
56 | + uint32_t flag; | ||
57 | }; | ||
58 | const struct desc *d = a; | ||
59 | |||