diff options
| author | bors <bors@rust-lang.org> | 2023-04-23 00:20:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-23 00:20:04 +0000 |
| commit | 86593ceee82f9d7880f572917dab88f9c6c5cf60 (patch) | |
| tree | b543472487c633d281fb9bfdf6a6ff91e11744c1 | |
| parent | fc51b8b69af739b2ea0756de65d333975d386981 (diff) | |
| parent | b5fff1d13a0a7a0de611c60eaee909fd598d6881 (diff) | |
| download | rust-libc-86593ceee82f9d7880f572917dab88f9c6c5cf60.tar.gz | |
Auto merge of #3197 - zonyitoo:master, r=JohnTitor
linux_like: IPPROTO_MPTCP are supported in all linux_like platforms
`IPPROTO_MPTCP` is supported on Android.
Android: https://android.googlesource.com/platform/external/kernel-headers/+/refs/heads/master/original/uapi/linux/in.h#85
| -rw-r--r-- | libc-test/build.rs | 2 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/linux_like/mod.rs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index 85536110cf..65a3b26712 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1795,6 +1795,8 @@ fn test_android(target: &str) { | "MADV_POPULATE_READ" | "MADV_POPULATE_WRITE" => true, + // kernel 5.6 minimum required + "IPPROTO_MPTCP" => true, _ => false, } diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index a982901113..dae589fd14 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -1933,8 +1933,6 @@ pub const CLONE_PIDFD: ::c_int = 0x1000; // netinet/in.h // NOTE: These are in addition to the constants defined in src/unix/mod.rs -/// Multipath TCP -pub const IPPROTO_MPTCP: ::c_int = 262; #[deprecated( since = "0.2.80", note = "This value was increased in the newer kernel \ diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs index 5142ac499f..e08bb7dbb0 100644 --- a/src/unix/linux_like/mod.rs +++ b/src/unix/linux_like/mod.rs @@ -916,6 +916,8 @@ pub const IPPROTO_UDPLITE: ::c_int = 136; pub const IPPROTO_RAW: ::c_int = 255; pub const IPPROTO_BEETPH: ::c_int = 94; pub const IPPROTO_MPLS: ::c_int = 137; +/// Multipath TCP +pub const IPPROTO_MPTCP: ::c_int = 262; pub const MCAST_EXCLUDE: ::c_int = 0; pub const MCAST_INCLUDE: ::c_int = 1; |