| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | This fixes a compile issue introduced with linux kernel 4.15 |
| 2 | |
| 3 | include/linux/in.h:222:8: error: redefinition of 'struct in_pktinfo' |
| 4 | | struct in_pktinfo { |
| 5 | |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
| 9 | |
| 10 | Index: openl2tp-1.8/plugins/ppp_unix.c |
| 11 | =================================================================== |
| 12 | --- openl2tp-1.8.orig/plugins/ppp_unix.c |
| 13 | +++ openl2tp-1.8/plugins/ppp_unix.c |
| 14 | @@ -25,9 +25,14 @@ |
| 15 | #include <fcntl.h> |
| 16 | #include <sys/types.h> |
| 17 | #include <signal.h> |
| 18 | +#include <linux/version.h> |
| 19 | + |
| 20 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) |
| 21 | #include <net/ethernet.h> |
| 22 | #include <net/if.h> |
| 23 | #include <netinet/in.h> |
| 24 | +#endif |
| 25 | + |
| 26 | #include <arpa/inet.h> |
| 27 | #include <sys/stat.h> |
| 28 | #include <unistd.h> |
| 29 | @@ -41,12 +46,12 @@ |
| 30 | #define __user |
| 31 | #endif |
| 32 | #include <sys/ioctl.h> |
| 33 | -#include <linux/if_ether.h> |
| 34 | -#include <linux/if_pppox.h> |
| 35 | #include <linux/ppp_defs.h> |
| 36 | #include <linux/if_ppp.h> |
| 37 | +#include <linux/if_pppox.h> |
| 38 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) |
| 39 | #include <linux/if_pppol2tp.h> |
| 40 | - |
| 41 | +#endif |
| 42 | #include "usl.h" |
| 43 | #include "l2tp_private.h" |
| 44 | |