summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-03-03 16:27:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-05 15:50:21 +0000
commit3b56aa94a764a2ffeec05ab5d13eac1931502385 (patch)
treeac04ec083027d5cfa2fc7301565ad4f2f09ba89c
parent6fe2315420c025c14a4e07bbf2a00d4a8ab4e143 (diff)
downloadpoky-3b56aa94a764a2ffeec05ab5d13eac1931502385.tar.gz
ppp: drop if_pppol2tp.h patches
The old version of Linux if_pppol2tp.h was removed, so droped the related patches. Here is the commit from git://github.com/paulusmack/ppp.git ... commit c41092dd4c49267f232f6cba3d31c6c68bfdf68d Author: Paul Mackerras <paulus@samba.org> Date: Sun May 20 16:48:17 2012 +1000 Remove old version of Linux if_pppol2tp.h This has been in the Linux kernel source now for long enough that we can rely on getting a usable version from /usr/include on all distributions that we care about. The version we have here had started to lag behind what is in the Linux kernel, causing compilation errors due to struct pppol2tpv3_addr being undefined. Removing our local version means we will use what is in /usr/include instead. ... (From OE-Core rev: 5ea7b47c10bf9e4a1741c165de39456f1cb4e6ff) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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.patch60
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch54
2 files changed, 0 insertions, 114 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
deleted file mode 100644
index 33b200a3bd..0000000000
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 17ffc69db08c809c069e73aa2f2ed2ce02df5fa8 Mon Sep 17 00:00:00 2001
2From: Lu Chong <Chong.Lu@windriver.com>
3Date: Sat, 2 Nov 2013 14:34:24 +0800
4Subject: [PATCH] ppp: Add two structures in if_pppol2tp.h
5
6Some further structure definitions are needed in include/linux/if_pppol2tp.h for IPv6 support.
7
8Upstream-Status: Pending
9
10Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
11---
12 include/linux/if_pppol2tp.h | 25 +++++++++++++++++++++++++
13 1 file changed, 25 insertions(+)
14
15diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
16index 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--
591.7.9.5
60
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
deleted file mode 100644
index e034f19d81..0000000000
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch
+++ /dev/null
@@ -1,54 +0,0 @@
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