Skip to content

Commit 7b5afd2

Browse files
committed
Auto merge of #2776 - cww0614:socks_txtime_mips_musl, r=Amanieu
Enable sock_txtime on mips musl target The struct and related constants were originally added in #2415. But they weren't enabled for mips musl target because the kernel version of the build image was old and they couldn't pass the build. Now the kernel version of the build image is already updated and I think we could enable them for mips musl target
2 parents e53cf4f + 853f70c commit 7b5afd2

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
@@ -2070,6 +2070,8 @@ SOF_TIMESTAMPING_SOFTWARE
20702070
SOF_TIMESTAMPING_SYS_HARDWARE
20712071
SOF_TIMESTAMPING_TX_HARDWARE
20722072
SOF_TIMESTAMPING_TX_SOFTWARE
2073+
SOF_TXTIME_DEADLINE_MODE
2074+
SOF_TXTIME_REPORT_ERRORS
20732075
SOL_AAL
20742076
SOL_ALG
20752077
SOL_ATM
@@ -3064,6 +3066,7 @@ sigwaitinfo
30643066
sock_extended_err
30653067
sock_filter
30663068
sock_fprog
3069+
sock_txtime
30673070
sockaddr_alg
30683071
sockaddr_can
30693072
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

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

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

0 commit comments

Comments
 (0)