Skip to content

Commit 540d160

Browse files
committed
Enable sock_txtime on mips musl target
1 parent 42faa24 commit 540d160

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

libc-test/semver/linux.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2069,6 +2069,8 @@ SOF_TIMESTAMPING_SOFTWARE
20692069
SOF_TIMESTAMPING_SYS_HARDWARE
20702070
SOF_TIMESTAMPING_TX_HARDWARE
20712071
SOF_TIMESTAMPING_TX_SOFTWARE
2072+
SOF_TXTIME_DEADLINE_MODE
2073+
SOF_TXTIME_REPORT_ERRORS
20722074
SOL_AAL
20732075
SOL_ALG
20742076
SOL_ATM
@@ -3063,6 +3065,7 @@ sigwaitinfo
30633065
sock_extended_err
30643066
sock_filter
30653067
sock_fprog
3068+
sock_txtime
30663069
sockaddr_alg
30673070
sockaddr_can
30683071
sockaddr_ll

src/unix/linux_like/linux/mod.rs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -685,16 +685,12 @@ s_no_extra_traits! {
685685
}
686686
}
687687

688-
cfg_if! {
689-
if #[cfg(not(all(target_env = "musl", target_arch = "mips")))] {
690-
s_no_extra_traits! {
691-
// linux/net_tstamp.h
692-
#[allow(missing_debug_implementations)]
693-
pub struct sock_txtime {
694-
pub clockid: ::clockid_t,
695-
pub flags: ::__u32,
696-
}
697-
}
688+
s_no_extra_traits! {
689+
// linux/net_tstamp.h
690+
#[allow(missing_debug_implementations)]
691+
pub struct sock_txtime {
692+
pub clockid: ::clockid_t,
693+
pub flags: ::__u32,
698694
}
699695
}
700696

@@ -2663,12 +2659,8 @@ pub const SOF_TIMESTAMPING_RX_SOFTWARE: ::c_uint = 1 << 3;
26632659
pub const SOF_TIMESTAMPING_SOFTWARE: ::c_uint = 1 << 4;
26642660
pub const SOF_TIMESTAMPING_SYS_HARDWARE: ::c_uint = 1 << 5;
26652661
pub const SOF_TIMESTAMPING_RAW_HARDWARE: ::c_uint = 1 << 6;
2666-
cfg_if! {
2667-
if #[cfg(not(all(target_env = "musl", target_arch = "mips")))] {
2668-
pub const SOF_TXTIME_DEADLINE_MODE: u32 = 1 << 0;
2669-
pub const SOF_TXTIME_REPORT_ERRORS: u32 = 1 << 1;
2670-
}
2671-
}
2662+
pub const SOF_TXTIME_DEADLINE_MODE: u32 = 1 << 0;
2663+
pub const SOF_TXTIME_REPORT_ERRORS: u32 = 1 << 1;
26722664

26732665
// linux/if_alg.h
26742666
pub const ALG_SET_KEY: ::c_int = 1;

0 commit comments

Comments
 (0)