diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2017-11-17 10:17:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:32 +0000 |
commit | 6ee124905f5241ea2b96822111a08e1463d319d2 (patch) | |
tree | b444dcdffb8d515f5ae83bf65b043b725136b420 /meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch | |
parent | ed48e7b4f0d11bf20e0be44d8403fc16dd6d4411 (diff) | |
download | poky-6ee124905f5241ea2b96822111a08e1463d319d2.tar.gz |
ppp: include netinet/in.h before linux/in.h in pppoe.h
The patch ppp-fix-building-with-linux-4.8.patch tries to fix build error
with 4.8 or newer linux headers, but it would break building with kernel
< 4.8. There is a better solution to fix this issue in upstream.
Backport the upstream patch and replace the old one.
(From OE-Core rev: 85095edfc4bbf23d853fc21fbfb454e598206a24)
Signed-off-by: Yi Zhao <yi.zhao@windriver.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/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch new file mode 100644 index 0000000000..9362d12648 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 50a2997b256e0e0ef7a46fae133f56f60fce539c Mon Sep 17 00:00:00 2001 | ||
2 | From: Lubomir Rintel <lkundrak@v3.sk> | ||
3 | Date: Mon, 9 Jan 2017 13:34:23 +0000 | ||
4 | Subject: [PATCH] pppoe: include netinet/in.h before linux/in.h | ||
5 | |||
6 | This fixes builds with newer kernels. Basically, <netinet/in.h> needs to be | ||
7 | included before <linux/in.h> otherwise the earlier, unaware of the latter, | ||
8 | tries to redefine symbols and structures. Also, <linux/if_pppox.h> doesn't work | ||
9 | alone anymore, since it pulls the headers in the wrong order, so we better | ||
10 | include <netinet/in.h> early. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | [https://github.com/paulusmack/ppp/commit/50a2997b256e0e0ef7a46fae133f56f60fce539c] | ||
14 | |||
15 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
16 | --- | ||
17 | pppd/plugins/rp-pppoe/pppoe.h | 7 ++++--- | ||
18 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h | ||
21 | index 9ab2eee..c4aaa6e 100644 | ||
22 | --- a/pppd/plugins/rp-pppoe/pppoe.h | ||
23 | +++ b/pppd/plugins/rp-pppoe/pppoe.h | ||
24 | @@ -47,6 +47,10 @@ | ||
25 | #include <sys/socket.h> | ||
26 | #endif | ||
27 | |||
28 | +/* This has to be included before Linux 4.8's linux/in.h | ||
29 | + * gets dragged in. */ | ||
30 | +#include <netinet/in.h> | ||
31 | + | ||
32 | /* Ugly header files on some Linux boxes... */ | ||
33 | #if defined(HAVE_LINUX_IF_H) | ||
34 | #include <linux/if.h> | ||
35 | @@ -84,8 +88,6 @@ typedef unsigned long UINT32_t; | ||
36 | #include <linux/if_ether.h> | ||
37 | #endif | ||
38 | |||
39 | -#include <netinet/in.h> | ||
40 | - | ||
41 | #ifdef HAVE_NETINET_IF_ETHER_H | ||
42 | #include <sys/types.h> | ||
43 | |||
44 | @@ -98,7 +100,6 @@ typedef unsigned long UINT32_t; | ||
45 | #endif | ||
46 | |||
47 | |||
48 | - | ||
49 | /* Ethernet frame types according to RFC 2516 */ | ||
50 | #define ETH_PPPOE_DISCOVERY 0x8863 | ||
51 | #define ETH_PPPOE_SESSION 0x8864 | ||
52 | -- | ||
53 | 2.7.4 | ||
54 | |||