Merge branch 'master' into set-sockaddr-length-linux

1 files changed, 7 insertions, 3 deletions

diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
index 4ca12997..3abcb033 100644
--- a/src/sys/socket/mod.rs
+++ b/src/sys/socket/mod.rs
@@ -247,14 +247,18 @@ libc_bitflags! {
         SOF_TIMESTAMPING_SOFTWARE;
         /// Report hardware timestamps as generated by SOF_TIMESTAMPING_TX_HARDWARE when available.
         SOF_TIMESTAMPING_RAW_HARDWARE;
-        /// Collect transmiting timestamps as reported by hardware
+        /// Collect transmitting timestamps as reported by hardware
         SOF_TIMESTAMPING_TX_HARDWARE;
-        /// Collect transmiting timestamps as reported by software
+        /// Collect transmitting timestamps as reported by software
         SOF_TIMESTAMPING_TX_SOFTWARE;
         /// Collect receiving timestamps as reported by hardware
         SOF_TIMESTAMPING_RX_HARDWARE;
         /// Collect receiving timestamps as reported by software
         SOF_TIMESTAMPING_RX_SOFTWARE;
+        /// Generate a unique identifier along with each transmitted packet
+        SOF_TIMESTAMPING_OPT_ID;
+        /// Return transmit timestamps alongside an empty packet instead of the original packet
+        SOF_TIMESTAMPING_OPT_TSONLY;
     }
 }
 
@@ -2239,7 +2243,7 @@ pub fn recvfrom<T: SockaddrLike>(
         Ok((
             ret,
             T::from_raw(
-                addr.assume_init().as_ptr() as *const sockaddr,
+                addr.assume_init().as_ptr(),
                 Some(len),
             ),
         ))