Snap for 8451755 from 5956c3fc7febb443a202efdd689f5daa19334ca1 to tm-release
Change-Id: I0c68d378e4fb1a6faf7ba1cfc30317be4185dbf4
diff --git a/patches/if_tun.diff b/patches/if_tun.diff
new file mode 100644
index 0000000..1e79076
--- /dev/null
+++ b/patches/if_tun.diff
@@ -0,0 +1,25 @@
+diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
+index 236f57a4..fe2d2096 100644
+--- a/src/unix/linux_like/android/mod.rs
++++ b/src/unix/linux_like/android/mod.rs
+@@ -2168,9 +2168,20 @@ pub const NFT_TRACETYPE_RULE: ::c_int = 3;
+ pub const NFT_NG_INCREMENTAL: ::c_int = 0;
+ pub const NFT_NG_RANDOM: ::c_int = 1;
+
++// bionic/libc/kernel/uapi/linux/if_tun.h
+ pub const IFF_TUN: ::c_int = 0x0001;
+ pub const IFF_TAP: ::c_int = 0x0002;
++pub const IFF_NAPI: ::c_int = 0x0010;
++pub const IFF_NAPI_FRAGS: ::c_int = 0x0020;
+ pub const IFF_NO_PI: ::c_int = 0x1000;
++pub const IFF_ONE_QUEUE: ::c_int = 0x2000;
++pub const IFF_VNET_HDR: ::c_int = 0x4000;
++pub const IFF_TUN_EXCL: ::c_int = 0x8000;
++pub const IFF_MULTI_QUEUE: ::c_int = 0x0100;
++pub const IFF_ATTACH_QUEUE: ::c_int = 0x0200;
++pub const IFF_DETACH_QUEUE: ::c_int = 0x0400;
++pub const IFF_PERSIST: ::c_int = 0x0800;
++pub const IFF_NOFILTER: ::c_int = 0x1000;
+
+ // start android/platform/bionic/libc/kernel/uapi/linux/if_ether.h
+ // from https://android.googlesource.com/
diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
index 236f57a..fe2d209 100644
--- a/src/unix/linux_like/android/mod.rs
+++ b/src/unix/linux_like/android/mod.rs
@@ -2168,9 +2168,20 @@
pub const NFT_NG_INCREMENTAL: ::c_int = 0;
pub const NFT_NG_RANDOM: ::c_int = 1;
+// bionic/libc/kernel/uapi/linux/if_tun.h
pub const IFF_TUN: ::c_int = 0x0001;
pub const IFF_TAP: ::c_int = 0x0002;
+pub const IFF_NAPI: ::c_int = 0x0010;
+pub const IFF_NAPI_FRAGS: ::c_int = 0x0020;
pub const IFF_NO_PI: ::c_int = 0x1000;
+pub const IFF_ONE_QUEUE: ::c_int = 0x2000;
+pub const IFF_VNET_HDR: ::c_int = 0x4000;
+pub const IFF_TUN_EXCL: ::c_int = 0x8000;
+pub const IFF_MULTI_QUEUE: ::c_int = 0x0100;
+pub const IFF_ATTACH_QUEUE: ::c_int = 0x0200;
+pub const IFF_DETACH_QUEUE: ::c_int = 0x0400;
+pub const IFF_PERSIST: ::c_int = 0x0800;
+pub const IFF_NOFILTER: ::c_int = 0x1000;
// start android/platform/bionic/libc/kernel/uapi/linux/if_ether.h
// from https://android.googlesource.com/
