From 478f9274c3ca0b435ecf55a143acfa0850a916e7 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 3 Sep 2021 12:58:22 +0200 Subject: [PATCH] Try to fix compilation patch for bpi-r2 --- iperf3/patches/remove-in6_flowlabel_req.patch | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/iperf3/patches/remove-in6_flowlabel_req.patch b/iperf3/patches/remove-in6_flowlabel_req.patch index 3d2be694f..539f9c3c8 100644 --- a/iperf3/patches/remove-in6_flowlabel_req.patch +++ b/iperf3/patches/remove-in6_flowlabel_req.patch @@ -1,24 +1,25 @@ --- a/src/flowlabel.h 2021-06-24 13:26:33.142463630 +0200 +++ b/src/flowlabel.h 2021-06-24 13:27:45.669235179 +0200 -@@ -37,21 +37,6 @@ +@@ -37,21 +37,21 @@ conflicts with "netinet/in.h" . */ -#ifndef __ANDROID__ --struct in6_flowlabel_req --{ -- struct in6_addr flr_dst; -- __u32 flr_label; -- __u8 flr_action; -- __u8 flr_share; -- __u16 flr_flags; -- __u16 flr_expires; -- __u16 flr_linger; -- __u32 __flr_pad; -- /* Options in format of IPV6_PKTOPTIONS */ --}; --#endif -- ++#ifndef _LINUX_IN6_H + struct in6_flowlabel_req + { + struct in6_addr flr_dst; + __u32 flr_label; + __u8 flr_action; + __u8 flr_share; + __u16 flr_flags; + __u16 flr_expires; + __u16 flr_linger; + __u32 __flr_pad; + /* Options in format of IPV6_PKTOPTIONS */ + }; + #endif + #define IPV6_FL_A_GET 0 #define IPV6_FL_A_PUT 1 #define IPV6_FL_A_RENEW 2