From c1aae78816b70d39db7de6725b2cba332ecb5997 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 4 Nov 2012 17:01:27 +0000
Subject: ppp: add more pppol2tpv3 related structs from the kernel headers to
fix compile issues with linux 3.6
SVN-Revision: 34070
---
.../ppp/patches/430-pppol2tpv3-struct.patch | 28 +++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
(limited to 'package/network/services/ppp/patches')
diff --git a/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch b/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch
index 4f517df764..204aa4e0e8 100644
--- a/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch
+++ b/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch
@@ -7,10 +7,25 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
-@@ -32,6 +32,20 @@ struct pppol2tp_addr
+@@ -32,6 +32,46 @@ 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
++{
++ 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.
+ */
@@ -24,6 +39,17 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+ __u32 s_tunnel, s_session; /* For matching incoming packets */
+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
+};
++
++struct pppol2tpv3in6_addr {
++ 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
--
cgit v1.2.3