aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2017-11-13 16:06:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 13:02:44 +0000
commit9839de8861c5fb2067664542045c0728653bbcb4 (patch)
tree44005b13bc1134d540bb468c08bde1ec45f68a9f /meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
parent638b4ac5279225b89edcd411e39aa2c22617dcd5 (diff)
downloadopenembedded-core-contrib-9839de8861c5fb2067664542045c0728653bbcb4.tar.gz
iproute2: upgrade to 4.13
- 0001-include-stdint.h-explicitly-for-UINT16_MAX.patch is already applied to upstream. - Rebase two patches. Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
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.patch16
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 @@
-From f58fc99c88a54135e55a6e0956ce8ae71078d1cc Mon Sep 17 00:00:00 2001
+From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001
From: Changhyeok Bae <changhyeok.bae@gmail.com>
-Date: Mon, 12 Jun 2017 04:29:07 +0000
+Date: Mon, 13 Nov 2017 15:59:35 +0000
Subject: [PATCH] ip: Remove unneed header
Fix redefinition of struct ethhdr with a suitably patched musl libc
@@ -8,23 +8,23 @@ that suppresses the kernel if_ether.h.
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
-Upstream-Status: Submitted [netdev@vger.kernel.org]
+Upstream-Status: Pending [netdev@vger.kernel.org]
---
ip/iplink_bridge.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
-index 818b43c..f065b22 100644
+index cccdec1..f065b22 100644
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
-@@ -15,7 +15,6 @@
+@@ -13,7 +13,6 @@
+ #include <stdlib.h>
+ #include <string.h>
#include <netinet/in.h>
+-#include <netinet/ether.h>
#include <linux/if_link.h>
#include <linux/if_bridge.h>
--#include <netinet/ether.h>
#include <net/if.h>
-
- #include "rt_names.h"
--
2.7.4