diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-03-04 16:30:40 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-03-04 16:30:40 +0100 |
| commit | 911a8d67bf979a65bfa3246f5c789588f3fc6bd6 (patch) | |
| tree | fdb3e3e7c07df020f952aa56b2d2df00c1f07afd /package/ppp | |
| parent | a709ebc3f96b3d00f3694468c1e3812d4fb0779e (diff) | |
resolve various build failures
Diffstat (limited to 'package/ppp')
| -rw-r--r-- | package/ppp/patches/patch-include_linux_if_pppol2tp_h | 30 | ||||
| -rw-r--r-- | package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux | 4 |
2 files changed, 30 insertions, 4 deletions
diff --git a/package/ppp/patches/patch-include_linux_if_pppol2tp_h b/package/ppp/patches/patch-include_linux_if_pppol2tp_h index 3f8c404da..9e346beab 100644 --- a/package/ppp/patches/patch-include_linux_if_pppol2tp_h +++ b/package/ppp/patches/patch-include_linux_if_pppol2tp_h @@ -1,6 +1,6 @@ --- ppp-2.4.5.orig/include/linux/if_pppol2tp.h 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-08-29 19:36:29.823658423 +0200 -@@ -32,6 +32,20 @@ struct pppol2tp_addr ++++ ppp-2.4.5/include/linux/if_pppol2tp.h 2013-03-04 12:38:54.000000000 +0100 +@@ -32,6 +32,46 @@ struct pppol2tp_addr __u16 d_tunnel, d_session; /* For sending outgoing packets */ }; @@ -18,6 +18,32 @@ + __u32 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 */ ++}; ++ ++ ++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 diff --git a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux index 32a86eaf7..93523d958 100644 --- a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux @@ -1,5 +1,5 @@ --- ppp-2.4.5.orig/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2011-01-21 21:29:58.177408277 +0100 ++++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2013-03-04 12:31:16.000000000 +0100 @@ -1,15 +1,16 @@ -#CC = gcc -COPTS = -O2 -g @@ -26,7 +26,7 @@ PLUGIN := pppoatm.so PLUGIN_OBJS := pppoatm.o -@@ -22,25 +23,22 @@ PLUGIN_OBJS := pppoatm.o +@@ -22,25 +23,22 @@ PLUGIN_OBJS := pppoatm.o #HAVE_LIBATM=yes ifdef HAVE_LIBATM |