Merge branch 'main' into main

5 files changed, 21 insertions, 6 deletions

diff --git a/embassy-net/src/icmp.rs b/embassy-net/src/icmp.rs
index 22c31a589..09e91a1ae 100644
--- a/embassy-net/src/icmp.rs
+++ b/embassy-net/src/icmp.rs
@@ -1,6 +1,6 @@
 //! ICMP sockets.
 
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::mem;
 use core::task::{Context, Poll};
 
diff --git a/embassy-net/src/lib.rs b/embassy-net/src/lib.rs
index 3f0634849..a49955c96 100644
--- a/embassy-net/src/lib.rs
+++ b/embassy-net/src/lib.rs
@@ -1,5 +1,6 @@
 #![no_std]
 #![allow(async_fn_in_trait)]
+#![allow(unsafe_op_in_unsafe_fn)]
 #![warn(missing_docs)]
 #![doc = include_str!("../README.md")]
 
@@ -26,7 +27,7 @@ mod time;
 pub mod udp;
 
 use core::cell::RefCell;
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::mem::MaybeUninit;
 use core::pin::pin;
 use core::task::{Context, Poll};
diff --git a/embassy-net/src/raw.rs b/embassy-net/src/raw.rs
index c9f753f13..89d2dd350 100644
--- a/embassy-net/src/raw.rs
+++ b/embassy-net/src/raw.rs
@@ -1,6 +1,6 @@
 //! Raw sockets.
 
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::mem;
 use core::task::{Context, Poll};
 
diff --git a/embassy-net/src/tcp.rs b/embassy-net/src/tcp.rs
index d0230b581..b4db7b88c 100644
--- a/embassy-net/src/tcp.rs
+++ b/embassy-net/src/tcp.rs
@@ -8,7 +8,7 @@
 //! Incoming connections when no socket is listening are rejected. To accept many incoming
 //! connections, create many sockets and put them all into listening mode.
 
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::mem;
 use core::task::{Context, Poll};
 
@@ -18,8 +18,8 @@ use smoltcp::socket::tcp;
 pub use smoltcp::socket::tcp::State;
 use smoltcp::wire::{IpEndpoint, IpListenEndpoint};
 
-use crate::time::duration_to_smoltcp;
 use crate::Stack;
+use crate::time::duration_to_smoltcp;
 
 /// Error returned by TcpSocket read/write functions.
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
@@ -373,6 +373,20 @@ impl<'a> TcpSocket<'a> {
         self.io.with_mut(|s, _| s.set_hop_limit(hop_limit))
     }
 
+    /// Enable or disable Nagles's algorithm.
+    ///
+    /// By default, Nagle's algorithm is enabled.
+    /// When enabled, Nagle’s Algorithm prevents sending segments smaller
+    /// than MSS if there is data in flight (sent but not acknowledged).
+    /// In other words, it ensures at most only one segment smaller than
+    /// MSS is in flight at a time.
+    /// It ensures better network utilization by preventing sending many
+    /// very small packets, at the cost of increased latency in some
+    /// situations, particularly when the remote peer has ACK delay enabled.
+    pub fn set_nagle_enabled(&mut self, enabled: bool) {
+        self.io.with_mut(|s, _| s.set_nagle_enabled(enabled))
+    }
+
     /// Get the local endpoint of the socket.
     ///
     /// Returns `None` if the socket is not bound (listening) or not connected.
diff --git a/embassy-net/src/udp.rs b/embassy-net/src/udp.rs
index 482eb0e56..448c25ecc 100644
--- a/embassy-net/src/udp.rs
+++ b/embassy-net/src/udp.rs
@@ -1,6 +1,6 @@
 //! UDP sockets.
 
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::mem;
 use core::task::{Context, Poll};