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

1 files changed, 8 insertions, 16 deletions

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index 8806ab993f..89f58ee0dd 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -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,
     }
 }
 
@@ -2664,12 +2660,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;