Skip to content

Commit 86593ce

Browse files
committed
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
2 parents fc51b8b + b5fff1d commit 86593ce

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

libc-test/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,6 +1795,8 @@ fn test_android(target: &str) {
17951795
| "MADV_POPULATE_READ"
17961796
| "MADV_POPULATE_WRITE" => true,
17971797

1798+
// kernel 5.6 minimum required
1799+
"IPPROTO_MPTCP" => true,
17981800

17991801
_ => false,
18001802
}

src/unix/linux_like/linux/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,8 +1933,6 @@ pub const CLONE_PIDFD: ::c_int = 0x1000;
19331933
// netinet/in.h
19341934
// NOTE: These are in addition to the constants defined in src/unix/mod.rs
19351935

1936-
/// Multipath TCP
1937-
pub const IPPROTO_MPTCP: ::c_int = 262;
19381936
#[deprecated(
19391937
since = "0.2.80",
19401938
note = "This value was increased in the newer kernel \

src/unix/linux_like/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,8 @@ pub const IPPROTO_UDPLITE: ::c_int = 136;
916916
pub const IPPROTO_RAW: ::c_int = 255;
917917
pub const IPPROTO_BEETPH: ::c_int = 94;
918918
pub const IPPROTO_MPLS: ::c_int = 137;
919+
/// Multipath TCP
920+
pub const IPPROTO_MPTCP: ::c_int = 262;
919921

920922
pub const MCAST_EXCLUDE: ::c_int = 0;
921923
pub const MCAST_INCLUDE: ::c_int = 1;

0 commit comments

Comments
 (0)