qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:56:14 +02:00
Code

ppp: add more pppol2tpv3 related structs from the kernel headers to fix compile issues with linux 3.6

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34070 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-11-04 17:01:27 +00:00
parent 084810ea1b
commit 59991e53bc
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package/network/services/ppp/patches/430-pppol2tpv3-struct.patch
View File

@ -7,10 +7,25 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
--- a/include/linux/if_pppol2tp.h --- a/include/linux/if_pppol2tp.h
+++ b/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 */ __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 +/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure. + * 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 s_tunnel, s_session; /* For matching incoming packets */
+ __u32 d_tunnel, d_session; /* For sending outgoing 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: /* Socket options:
* DEBUG - bitmask of debug message categories * DEBUG - bitmask of debug message categories