diff options
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch b/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch deleted file mode 100644 index f77b0defc5..0000000000 --- a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 3da19af53e2eee2e77b456cfbb9d633b06656d38 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Thu, 13 Oct 2016 13:41:43 +0800 | ||
4 | Subject: [PATCH] ppp: fix building with linux-4.8 | ||
5 | |||
6 | Fix a build error when using the linux-4.8 headers that results in: | ||
7 | |||
8 | In file included from pppoe.h:87:0, | ||
9 | from plugin.c:29: | ||
10 | ../usr/include/netinet/in.h:211:8: note: originally defined here | ||
11 | struct in6_addr | ||
12 | ^~~~~~~~ | ||
13 | In file included from ../usr/include/linux/if_pppol2tp.h:20:0, | ||
14 | from ../usr/include/linux/if_pppox.h:26, | ||
15 | from plugin.c:52: | ||
16 | ../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' | ||
17 | struct sockaddr_in6 { | ||
18 | ^~~~~~~~~~~~ | ||
19 | |||
20 | Upstream-Status: Submitted [1] | ||
21 | |||
22 | [1] https://github.com/paulusmack/ppp/pull/69 | ||
23 | |||
24 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
25 | --- | ||
26 | pppd/plugins/rp-pppoe/pppoe.h | 2 +- | ||
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h | ||
30 | index 9ab2eee..96d2794 100644 | ||
31 | --- a/pppd/plugins/rp-pppoe/pppoe.h | ||
32 | +++ b/pppd/plugins/rp-pppoe/pppoe.h | ||
33 | @@ -84,7 +84,7 @@ typedef unsigned long UINT32_t; | ||
34 | #include <linux/if_ether.h> | ||
35 | #endif | ||
36 | |||
37 | -#include <netinet/in.h> | ||
38 | +#include <linux/in.h> | ||
39 | |||
40 | #ifdef HAVE_NETINET_IF_ETHER_H | ||
41 | #include <sys/types.h> | ||
42 | -- | ||
43 | 2.8.3 | ||
44 | |||