summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-04-11 11:13:58 +0200
committerRonan Le Martret <ronan.lemartret@iot.bzh>2017-05-03 11:10:04 +0200
commit0f88b8b2e7b809dcbe1c6789de0b699a64119d3b (patch)
tree30f6eb1e7841cbf7deb11cb07e7f644ae56f3f41 /meta-rcar-gen3/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch
parentb251322cb8d3f493447835155b6bf81bc3a2fb35 (diff)
Revert "rcar-gen3: ppp: Add patches to fix build with 4.8/4.9 kernel headers"
This reverts commit 4979e05406c77524cf90b308ce4bf2a72032ee65. Change-Id: I842db06014c123b7f8e37fd6f071d9d58da9838f Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-rcar-gen3/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch')
-rw-r--r--meta-rcar-gen3/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/meta-rcar-gen3/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch b/meta-rcar-gen3/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch
deleted file mode 100644
index f77b0de..0000000
--- a/meta-rcar-gen3/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3da19af53e2eee2e77b456cfbb9d633b06656d38 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 13 Oct 2016 13:41:43 +0800
-Subject: [PATCH] ppp: fix building with linux-4.8
-
-Fix a build error when using the linux-4.8 headers that results in:
-
-In file included from pppoe.h:87:0,
- from plugin.c:29:
-../usr/include/netinet/in.h:211:8: note: originally defined here
- struct in6_addr
- ^~~~~~~~
-In file included from ../usr/include/linux/if_pppol2tp.h:20:0,
- from ../usr/include/linux/if_pppox.h:26,
- from plugin.c:52:
-../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6'
- struct sockaddr_in6 {
- ^~~~~~~~~~~~
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/paulusmack/ppp/pull/69
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- pppd/plugins/rp-pppoe/pppoe.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
-index 9ab2eee..96d2794 100644
---- a/pppd/plugins/rp-pppoe/pppoe.h
-+++ b/pppd/plugins/rp-pppoe/pppoe.h
-@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t;
- #include <linux/if_ether.h>
- #endif
-
--#include <netinet/in.h>
-+#include <linux/in.h>
-
- #ifdef HAVE_NETINET_IF_ETHER_H
- #include <sys/types.h>
---
-2.8.3
-