summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/ppp
diff options
context:
space:
mode:
authorYauhen Kharuzhy <yauhen.kharuzhy@promwad.com>2012-02-21 14:04:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:38 (GMT)
commitdced0c16e86130e7b2cde7c342dfc7237dc368b9 (patch)
tree36c893f47d1454758092082e7b58922d07b96f6e /meta/recipes-connectivity/ppp
parent83d1d135d6893a7ac75229cb101cde88db38f8ba (diff)
downloadpoky-dced0c16e86130e7b2cde7c342dfc7237dc368b9.tar.gz
ppp: Fix rp-pppoe plugin compilation
rp-pppoe plugin was broken due linux headers changes: pppd has own copy of if_pppol2tp.h file which is included from <linux/if_pppox.h>. Add patch from Debian for struct pppol2tpv3_addr definition. (From OE-Core rev: bc2581aff2a859b414c8097514527a9b5b0ab2a6) Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp')
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch54
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb3
2 files changed, 56 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch
new file mode 100644
index 0000000..e034f19
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch
@@ -0,0 +1,54 @@
1Upstream-Status: Pending
2diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
3index 4113d6a..7ee86b2 100644
4--- a/include/linux/if_pppol2tp.h
5+++ b/include/linux/if_pppol2tp.h
6@@ -2,7 +2,7 @@
7 * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
8 *
9 * This file supplies definitions required by the PPP over L2TP driver
10- * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c
11+ * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c
12 *
13 * License:
14 * This program is free software; you can redistribute it and/or
15@@ -15,14 +15,14 @@
16 #ifndef __LINUX_IF_PPPOL2TP_H
17 #define __LINUX_IF_PPPOL2TP_H
18
19-#include <asm/types.h>
20+#include <linux/types.h>
21+
22
23 /* Structure used to connect() the socket to a particular tunnel UDP
24 * socket.
25 */
26-struct pppol2tp_addr
27-{
28- pid_t pid; /* pid that owns the fd.
29+struct pppol2tp_addr {
30+ __kernel_pid_t pid; /* pid that owns the fd.
31 * 0 => current */
32 int fd; /* FD of UDP socket to use */
33
34@@ -32,6 +32,20 @@ struct pppol2tp_addr
35 __u16 d_tunnel, d_session; /* For sending outgoing packets */
36 };
37
38+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
39+ * bits. So we need a different sockaddr structure.
40+ */
41+struct pppol2tpv3_addr {
42+ pid_t pid; /* pid that owns the fd.
43+ * 0 => current */
44+ int fd; /* FD of UDP or IP socket to use */
45+
46+ struct sockaddr_in addr; /* IP address and port to send to */
47+
48+ __u32 s_tunnel, s_session; /* For matching incoming packets */
49+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
50+};
51+
52 /* Socket options:
53 * DEBUG - bitmask of debug message categories
54 * SENDSEQ - 0 => don't send packets with sequence numbers
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index 72464bf..80f91e6 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ 10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ 11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" 12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
13PR = "r2" 13PR = "r3"
14 14
15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ 15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
16 file://makefile.patch \ 16 file://makefile.patch \
@@ -18,6 +18,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
18 file://pppd-resolv-varrun.patch \ 18 file://pppd-resolv-varrun.patch \
19 file://enable-ipv6.patch \ 19 file://enable-ipv6.patch \
20 file://makefile-remove-hard-usr-reference.patch \ 20 file://makefile-remove-hard-usr-reference.patch \
21 file://update_if_pppol2tp.patch \
21 file://pon \ 22 file://pon \
22 file://poff \ 23 file://poff \
23 file://init \ 24 file://init \