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 | 4c4da37c09bf04527ba4e76e701be8c718b8b97f (patch) | |
| tree | 3c0a33f3ba9215da4babc521e221737ca14ccaaa /package/ppp/patches/430-pppol2tpv3-struct.patch | |
| parent | e18ceb1dac82bf340a8d4c82bfd727a4ca4cec06 (diff) | |
| download | upstream-4c4da37c09bf04527ba4e76e701be8c718b8b97f.tar.gz upstream-4c4da37c09bf04527ba4e76e701be8c718b8b97f.tar.bz2 upstream-4c4da37c09bf04527ba4e76e701be8c718b8b97f.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>
SVN-Revision: 27818
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 |