--- embedaddon/iperf/src/flowlabel.h 2016/10/18 13:28:18 1.1.1.1 +++ embedaddon/iperf/src/flowlabel.h 2023/09/27 11:14:54 1.1.1.2 @@ -29,15 +29,18 @@ #include +#include -/* - It is just a stripped copy of the Linux kernel header "linux/in6.h" +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) +#include +#else +#ifndef __ANDROID__ +/* + It is just a stripped copy of the Linux kernel header "linux/in6.h" "Flow label" things are still not defined in "netinet/in*.h" headers, but we cannot use "linux/in6.h" immediately because it currently - conflicts with "netinet/in.h" . + conflicts with "netinet/in.h" . (in kernel versions < 3.7.0) */ - -#ifndef __ANDROID__ struct in6_flowlabel_req { struct in6_addr flr_dst; @@ -68,6 +71,7 @@ struct in6_flowlabel_req #define IPV6_FLOWINFO_FLOWLABEL 0x000fffff #define IPV6_FLOWINFO_PRIORITY 0x0ff00000 +#endif #define IPV6_FLOWLABEL_MGR 32 #define IPV6_FLOWINFO_SEND 33