diff options
author | Lu Chong <Chong.Lu@windriver.com> | 2013-11-02 16:30:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-05 22:04:28 +0000 |
commit | 10961366017af9fb87405878d55dcabaca5edc20 (patch) | |
tree | 809877217dd16131a40d68ccfb49e531d964a0d4 | |
parent | ef942e3abdfa822271efd7c0f629829a80132fe5 (diff) | |
download | poky-10961366017af9fb87405878d55dcabaca5edc20.tar.gz |
ppp: Add two structures in if_pppol2tp.h
Some further structure definitions are needed in include/linux/if_pppol2tp.h for
IPv6 support, else we would get the error as below:
In file included from plugin.c:53:0:
bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:84:26:
error: field 'pppol2tp' has incomplete type
struct pppol2tpin6_addr pppol2tp;
^
bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:99:28:
error: field 'pppol2tp' has incomplete type
struct pppol2tpv3in6_addr pppol2tp;
^
make[2]: *** [plugin.o] Error 1
(From OE-Core rev: 73d08c4bf12e2cc4f291cb018d00b26a5a573be4)
Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch | 60 | ||||
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 4 |
2 files changed, 63 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch new file mode 100644 index 0000000000..33b200a3bd --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 17ffc69db08c809c069e73aa2f2ed2ce02df5fa8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lu Chong <Chong.Lu@windriver.com> | ||
3 | Date: Sat, 2 Nov 2013 14:34:24 +0800 | ||
4 | Subject: [PATCH] ppp: Add two structures in if_pppol2tp.h | ||
5 | |||
6 | Some further structure definitions are needed in include/linux/if_pppol2tp.h for IPv6 support. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Lu Chong <Chong.Lu@windriver.com> | ||
11 | --- | ||
12 | include/linux/if_pppol2tp.h | 25 +++++++++++++++++++++++++ | ||
13 | 1 file changed, 25 insertions(+) | ||
14 | |||
15 | diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h | ||
16 | index 7ee86b2..9d626d1 100644 | ||
17 | --- a/include/linux/if_pppol2tp.h | ||
18 | +++ b/include/linux/if_pppol2tp.h | ||
19 | @@ -32,6 +32,20 @@ struct pppol2tp_addr { | ||
20 | __u16 d_tunnel, d_session; /* For sending outgoing packets */ | ||
21 | }; | ||
22 | |||
23 | +/* Structure used to connect() the socket to a particular tunnel UDP | ||
24 | + * socket over IPv6. | ||
25 | + */ | ||
26 | +struct pppol2tpin6_addr { | ||
27 | + __kernel_pid_t pid; /* pid that owns the fd. | ||
28 | + * 0 => current */ | ||
29 | + int fd; /* FD of UDP socket to use */ | ||
30 | + | ||
31 | + __u16 s_tunnel, s_session; /* For matching incoming packets */ | ||
32 | + __u16 d_tunnel, d_session; /* For sending outgoing packets */ | ||
33 | + | ||
34 | + struct sockaddr_in6 addr; /* IP address and port to send to */ | ||
35 | +}; | ||
36 | + | ||
37 | /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 | ||
38 | * bits. So we need a different sockaddr structure. | ||
39 | */ | ||
40 | @@ -46,6 +60,17 @@ struct pppol2tpv3_addr { | ||
41 | __u32 d_tunnel, d_session; /* For sending outgoing packets */ | ||
42 | }; | ||
43 | |||
44 | +struct pppol2tpv3in6_addr { | ||
45 | + __kernel_pid_t pid; /* pid that owns the fd. | ||
46 | + * 0 => current */ | ||
47 | + int fd; /* FD of UDP or IP socket to use */ | ||
48 | + | ||
49 | + __u32 s_tunnel, s_session; /* For matching incoming packets */ | ||
50 | + __u32 d_tunnel, d_session; /* For sending outgoing packets */ | ||
51 | + | ||
52 | + struct sockaddr_in6 addr; /* IP address and port to send to */ | ||
53 | +}; | ||
54 | + | ||
55 | /* Socket options: | ||
56 | * DEBUG - bitmask of debug message categories | ||
57 | * SENDSEQ - 0 => don't send packets with sequence numbers | ||
58 | -- | ||
59 | 1.7.9.5 | ||
60 | |||
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index 39354efb17..dc8c9c110f 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb | |||
@@ -29,7 +29,9 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ | |||
29 | file://copts.patch \ | 29 | file://copts.patch \ |
30 | file://pap \ | 30 | file://pap \ |
31 | file://ppp_on_boot \ | 31 | file://ppp_on_boot \ |
32 | file://provider " | 32 | file://provider \ |
33 | file://0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch \ | ||
34 | " | ||
33 | 35 | ||
34 | SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" | 36 | SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" |
35 | SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" | 37 | SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" |