diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-04 17:01:27 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-04 17:01:27 +0000 |
| commit | 59991e53bc8dc750839a041cbcae429f3571ad82 (patch) | |
| tree | 628c5988cc8c18aa34008e2dfe3e747b913fae22 /package | |
| parent | 084810ea1bfb4289583ccf33b6a6d2fdd2412c37 (diff) | |
ppp: add more pppol2tpv3 related structs from the kernel headers to fix compile issues with linux 3.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34070 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/services/ppp/patches/430-pppol2tpv3-struct.patch | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch b/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch index 4f517df76..204aa4e0e 100644 --- a/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch +++ b/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch @@ -7,10 +7,25 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> --- a/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 */ }; ++/* 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 + * bits. So we need a different sockaddr structure. + */ @@ -25,6 +40,17 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> + __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: * DEBUG - bitmask of debug message categories * SENDSEQ - 0 => don't send packets with sequence numbers |