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 master rev: 73d08c4bf12e2cc4f291cb018d00b26a5a573be4) (From OE-Core rev: 398bae0d288f488020108c7d95bd376249e6ecbf) 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> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8b4c1515f1
commit
f46e8aa9f9
|
@ -0,0 +1,60 @@
|
|||
From 17ffc69db08c809c069e73aa2f2ed2ce02df5fa8 Mon Sep 17 00:00:00 2001
|
||||
From: Lu Chong <Chong.Lu@windriver.com>
|
||||
Date: Sat, 2 Nov 2013 14:34:24 +0800
|
||||
Subject: [PATCH] ppp: Add two structures in if_pppol2tp.h
|
||||
|
||||
Some further structure definitions are needed in include/linux/if_pppol2tp.h for IPv6 support.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
|
||||
---
|
||||
include/linux/if_pppol2tp.h | 25 +++++++++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
|
||||
index 7ee86b2..9d626d1 100644
|
||||
--- a/include/linux/if_pppol2tp.h
|
||||
+++ b/include/linux/if_pppol2tp.h
|
||||
@@ -32,6 +32,20 @@ struct pppol2tp_addr {
|
||||
__u16 d_tunnel, d_session; /* For sending outgoing packets */
|
||||
};
|
||||
|
||||
+/* Structure used to connect() the socket to a particular tunnel UDP
|
||||
+ * socket over IPv6.
|
||||
+ */
|
||||
+struct pppol2tpin6_addr {
|
||||
+ __kernel_pid_t pid; /* pid that owns the fd.
|
||||
+ * 0 => current */
|
||||
+ int fd; /* FD of UDP socket to use */
|
||||
+
|
||||
+ __u16 s_tunnel, s_session; /* For matching incoming packets */
|
||||
+ __u16 d_tunnel, d_session; /* For sending outgoing packets */
|
||||
+
|
||||
+ struct sockaddr_in6 addr; /* IP address and port to send to */
|
||||
+};
|
||||
+
|
||||
/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
|
||||
* bits. So we need a different sockaddr structure.
|
||||
*/
|
||||
@@ -46,6 +60,17 @@ struct pppol2tpv3_addr {
|
||||
__u32 d_tunnel, d_session; /* For sending outgoing packets */
|
||||
};
|
||||
|
||||
+struct pppol2tpv3in6_addr {
|
||||
+ __kernel_pid_t pid; /* pid that owns the fd.
|
||||
+ * 0 => current */
|
||||
+ int fd; /* FD of UDP or IP socket to use */
|
||||
+
|
||||
+ __u32 s_tunnel, s_session; /* For matching incoming packets */
|
||||
+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
|
||||
+
|
||||
+ struct sockaddr_in6 addr; /* IP address and port to send to */
|
||||
+};
|
||||
+
|
||||
/* Socket options:
|
||||
* DEBUG - bitmask of debug message categories
|
||||
* SENDSEQ - 0 => don't send packets with sequence numbers
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
@ -29,7 +29,9 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
|
|||
file://copts.patch \
|
||||
file://pap \
|
||||
file://ppp_on_boot \
|
||||
file://provider "
|
||||
file://provider \
|
||||
file://0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57"
|
||||
SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505"
|
||||
|
|
Loading…
Reference in New Issue