--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- ppp-2.4.5/include/linux/if_pppol2tp.h       2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5/include/linux/if_pppol2tp.h       2010-07-16 22:35:22.000000000 +0100
@@ -32,6 +32,45 @@ 
  	__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.
+ */
+struct pppol2tpv3_addr {
+       pid_t   pid;                    /* pid that owns the fd.
+                                        * 0 => current */
+       int     fd;                     /* FD of UDP or IP socket to use */
+
+       struct sockaddr_in addr;        /* IP address and port to send to */
+
+       __u32 s_tunnel, s_session;      /* For matching incoming packets */
+       __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