diff options
author | Changhyeok Bae <changhyeok.bae@gmail.com> | 2017-11-13 16:06:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 13:06:12 +0000 |
commit | eac8b65515d3478e4350af7d09d2c365866f8d5b (patch) | |
tree | 253e924cbc72ef5c377be0cfa84be937d348ba26 /meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch | |
parent | cf8aafe17ddd13a24c265d83f9c0a979bb2170f4 (diff) | |
download | poky-eac8b65515d3478e4350af7d09d2c365866f8d5b.tar.gz |
iproute2: upgrade to 4.13
- 0001-include-stdint.h-explicitly-for-UINT16_MAX.patch is already
applied to upstream.
- Rebase two patches.
(From OE-Core rev: 9839de8861c5fb2067664542045c0728653bbcb4)
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch index a9f8db6945..a9027c5b58 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From f58fc99c88a54135e55a6e0956ce8ae71078d1cc Mon Sep 17 00:00:00 2001 | 1 | From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001 |
2 | From: Changhyeok Bae <changhyeok.bae@gmail.com> | 2 | From: Changhyeok Bae <changhyeok.bae@gmail.com> |
3 | Date: Mon, 12 Jun 2017 04:29:07 +0000 | 3 | Date: Mon, 13 Nov 2017 15:59:35 +0000 |
4 | Subject: [PATCH] ip: Remove unneed header | 4 | Subject: [PATCH] ip: Remove unneed header |
5 | 5 | ||
6 | Fix redefinition of struct ethhdr with a suitably patched musl libc | 6 | Fix redefinition of struct ethhdr with a suitably patched musl libc |
@@ -8,23 +8,23 @@ that suppresses the kernel if_ether.h. | |||
8 | 8 | ||
9 | Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> | 9 | Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> |
10 | 10 | ||
11 | Upstream-Status: Submitted [netdev@vger.kernel.org] | 11 | Upstream-Status: Pending [netdev@vger.kernel.org] |
12 | --- | 12 | --- |
13 | ip/iplink_bridge.c | 1 - | 13 | ip/iplink_bridge.c | 1 - |
14 | 1 file changed, 1 deletion(-) | 14 | 1 file changed, 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c | 16 | diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c |
17 | index 818b43c..f065b22 100644 | 17 | index cccdec1..f065b22 100644 |
18 | --- a/ip/iplink_bridge.c | 18 | --- a/ip/iplink_bridge.c |
19 | +++ b/ip/iplink_bridge.c | 19 | +++ b/ip/iplink_bridge.c |
20 | @@ -15,7 +15,6 @@ | 20 | @@ -13,7 +13,6 @@ |
21 | #include <stdlib.h> | ||
22 | #include <string.h> | ||
21 | #include <netinet/in.h> | 23 | #include <netinet/in.h> |
24 | -#include <netinet/ether.h> | ||
22 | #include <linux/if_link.h> | 25 | #include <linux/if_link.h> |
23 | #include <linux/if_bridge.h> | 26 | #include <linux/if_bridge.h> |
24 | -#include <netinet/ether.h> | ||
25 | #include <net/if.h> | 27 | #include <net/if.h> |
26 | |||
27 | #include "rt_names.h" | ||
28 | -- | 28 | -- |
29 | 2.7.4 | 29 | 2.7.4 |
30 | 30 | ||