diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-07-28 16:51:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-28 16:51:12 +0000 |
| commit | 56add8a1e478796fc86a4d8911a8b41cbe344a07 (patch) | |
| tree | f300b7d987f7c0fda4a0d7f8213ec62ac86a7b5a /package/ppp/patches/430-pppol2tpv3-struct.patch | |
| parent | 8ac7c93036f2d779fd58db25e09ff7873114b877 (diff) | |
| download | upstream-56add8a1e478796fc86a4d8911a8b41cbe344a07.tar.gz upstream-56add8a1e478796fc86a4d8911a8b41cbe344a07.tar.bz2 upstream-56add8a1e478796fc86a4d8911a8b41cbe344a07.zip | |
ppp: version bump to 2.4.5
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
Diffstat (limited to 'package/ppp/patches/430-pppol2tpv3-struct.patch')
| -rw-r--r-- | package/ppp/patches/430-pppol2tpv3-struct.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/package/ppp/patches/430-pppol2tpv3-struct.patch b/package/ppp/patches/430-pppol2tpv3-struct.patch new file mode 100644 index 0000000000..c2f163b818 --- /dev/null +++ b/package/ppp/patches/430-pppol2tpv3-struct.patch @@ -0,0 +1,23 @@ +--- 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 |