mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-30 21:39:43 +02:00
79c8117684
Bump to the current version of PPP. A few of the patches are either in 2.4.5 or something functionally equivalent is, so those patches were removed. 1 patch was added to accommodate pppol2pv3_addr which is referenced in a linux kernel header file, but isn't defined in the kernel header files packaged with PPP. Redux: re-instate the commenting out of the exponential back-off as requested by Felix. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27818 3c298f89-4303-0410-b956-a3cf2f4a3e73
24 lines
775 B
Diff
24 lines
775 B
Diff
--- 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 */
|
|
};
|
|
|
|
+/* 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 */
|
|
+};
|
|
+
|
|
/* Socket options:
|
|
* DEBUG - bitmask of debug message categories
|
|
* SENDSEQ - 0 => don't send packets with sequence numbers
|