Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable sock_txtime on mips musl target #2776

Merged
merged 1 commit into from May 5, 2022
Merged

Enable sock_txtime on mips musl target #2776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions libc-test/semver/linux.txt
View file
Open in desktop
Expand Up @@ -2069,6 +2069,8 @@ SOF_TIMESTAMPING_SOFTWARE
SOF_TIMESTAMPING_SYS_HARDWARE
SOF_TIMESTAMPING_TX_HARDWARE
SOF_TIMESTAMPING_TX_SOFTWARE
SOF_TXTIME_DEADLINE_MODE
SOF_TXTIME_REPORT_ERRORS
SOL_AAL
SOL_ALG
SOL_ATM
Expand Down Expand Up @@ -3063,6 +3065,7 @@ sigwaitinfo
sock_extended_err
sock_filter
sock_fprog
sock_txtime
sockaddr_alg
sockaddr_can
sockaddr_ll
Expand Down
24 changes: 8 additions & 16 deletions src/unix/linux_like/linux/mod.rs
View file
Open in desktop
Expand Up @@ -685,16 +685,12 @@ s_no_extra_traits! {
}
}

cfg_if! {
if #[cfg(not(all(target_env = "musl", target_arch = "mips")))] {
s_no_extra_traits! {
// linux/net_tstamp.h
#[allow(missing_debug_implementations)]
pub struct sock_txtime {
pub clockid: ::clockid_t,
pub flags: ::__u32,
}
}
s_no_extra_traits! {
// linux/net_tstamp.h
#[allow(missing_debug_implementations)]
pub struct sock_txtime {
pub clockid: ::clockid_t,
pub flags: ::__u32,
}
}

Expand Down Expand Up @@ -2663,12 +2659,8 @@ pub const SOF_TIMESTAMPING_RX_SOFTWARE: ::c_uint = 1 << 3;
pub const SOF_TIMESTAMPING_SOFTWARE: ::c_uint = 1 << 4;
pub const SOF_TIMESTAMPING_SYS_HARDWARE: ::c_uint = 1 << 5;
pub const SOF_TIMESTAMPING_RAW_HARDWARE: ::c_uint = 1 << 6;
cfg_if! {
if #[cfg(not(all(target_env = "musl", target_arch = "mips")))] {
pub const SOF_TXTIME_DEADLINE_MODE: u32 = 1 << 0;
pub const SOF_TXTIME_REPORT_ERRORS: u32 = 1 << 1;
}
}
pub const SOF_TXTIME_DEADLINE_MODE: u32 = 1 << 0;
pub const SOF_TXTIME_REPORT_ERRORS: u32 = 1 << 1;

// linux/if_alg.h
pub const ALG_SET_KEY: ::c_int = 1;
Expand Down