Merge pull request #11353 from kvuorine/fwknop-fixes
[feed/packages.git] / ipv6 / miredo / patches / 002-fix-redefinition-ethadr.patch
1 --- a/libtun6/tun6.c 2012-09-12 17:03:59.000000000 +0400
2 +++ b/libtun6/tun6.c 2019-04-07 02:21:07.439952535 +0300
3 @@ -53,7 +53,7 @@
4 const char os_driver[] = "Linux";
5 # define USE_LINUX 1
6
7 -# include <linux/if_tun.h> // TUNSETIFF - Linux tunnel driver
8 +# include <linux/if_tun.h> // TUNSETIFF - Linux tunnel driver, ETH_P_IPV6
9 /*
10 * <linux/ipv6.h> conflicts with <netinet/in.h> and <arpa/inet.h>,
11 * so we've got to declare this structure by hand.
12 @@ -65,7 +65,7 @@
13 };
14
15 # include <net/route.h> // struct in6_rtmsg
16 -# include <netinet/if_ether.h> // ETH_P_IPV6
17 +//# include <netinet/if_ether.h> // ETH_P_IPV6
18
19 typedef struct
20 {
21