diff options
Diffstat (limited to 'embassy-net')
| -rw-r--r-- | embassy-net/src/lib.rs | 1 | ||||
| -rw-r--r-- | embassy-net/src/stack.rs | 12 | ||||
| -rw-r--r-- | embassy-net/src/tcp_socket.rs | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/embassy-net/src/lib.rs b/embassy-net/src/lib.rs index 47a3650b0..db2a7ebd4 100644 --- a/embassy-net/src/lib.rs +++ b/embassy-net/src/lib.rs | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #![cfg_attr(not(feature = "std"), no_std)] | 1 | #![cfg_attr(not(feature = "std"), no_std)] |
| 2 | #![allow(clippy::new_without_default)] | ||
| 2 | 3 | ||
| 3 | // This mod MUST go first, so that the others see its macros. | 4 | // This mod MUST go first, so that the others see its macros. |
| 4 | pub(crate) mod fmt; | 5 | pub(crate) mod fmt; |
diff --git a/embassy-net/src/stack.rs b/embassy-net/src/stack.rs index f26808cd0..42defdcaf 100644 --- a/embassy-net/src/stack.rs +++ b/embassy-net/src/stack.rs | |||
| @@ -140,7 +140,7 @@ impl Stack { | |||
| 140 | self.waker.register(cx.waker()); | 140 | self.waker.register(cx.waker()); |
| 141 | 141 | ||
| 142 | let timestamp = instant_to_smoltcp(Instant::now()); | 142 | let timestamp = instant_to_smoltcp(Instant::now()); |
| 143 | if let Err(_) = self.iface.poll(&mut self.sockets, timestamp) { | 143 | if self.iface.poll(&mut self.sockets, timestamp).is_err() { |
| 144 | // If poll() returns error, it may not be done yet, so poll again later. | 144 | // If poll() returns error, it may not be done yet, so poll again later. |
| 145 | cx.waker().wake_by_ref(); | 145 | cx.waker().wake_by_ref(); |
| 146 | return; | 146 | return; |
| @@ -152,18 +152,14 @@ impl Stack { | |||
| 152 | 152 | ||
| 153 | // Print when changed | 153 | // Print when changed |
| 154 | if old_link_up != self.link_up { | 154 | if old_link_up != self.link_up { |
| 155 | if self.link_up { | 155 | info!("link_up = {:?}", self.link_up); |
| 156 | info!("Link up!"); | ||
| 157 | } else { | ||
| 158 | info!("Link down!"); | ||
| 159 | } | ||
| 160 | } | 156 | } |
| 161 | 157 | ||
| 162 | if old_link_up || self.link_up { | 158 | if old_link_up || self.link_up { |
| 163 | self.poll_configurator(timestamp) | 159 | self.poll_configurator(timestamp) |
| 164 | } | 160 | } |
| 165 | 161 | ||
| 166 | if let Some(poll_at) = self.iface.poll_at(&mut self.sockets, timestamp) { | 162 | if let Some(poll_at) = self.iface.poll_at(&self.sockets, timestamp) { |
| 167 | let t = Timer::at(instant_from_smoltcp(poll_at)); | 163 | let t = Timer::at(instant_from_smoltcp(poll_at)); |
| 168 | pin_mut!(t); | 164 | pin_mut!(t); |
| 169 | if t.poll(cx).is_ready() { | 165 | if t.poll(cx).is_ready() { |
| @@ -215,7 +211,7 @@ pub fn init<const ADDR: usize, const SOCK: usize, const NEIGH: usize>( | |||
| 215 | let mut res = [0u8; 2]; | 211 | let mut res = [0u8; 2]; |
| 216 | rand(&mut res); | 212 | rand(&mut res); |
| 217 | let port = u16::from_le_bytes(res); | 213 | let port = u16::from_le_bytes(res); |
| 218 | if port >= LOCAL_PORT_MIN && port <= LOCAL_PORT_MAX { | 214 | if (LOCAL_PORT_MIN..=LOCAL_PORT_MAX).contains(&port) { |
| 219 | break port; | 215 | break port; |
| 220 | } | 216 | } |
| 221 | }; | 217 | }; |
diff --git a/embassy-net/src/tcp_socket.rs b/embassy-net/src/tcp_socket.rs index 25c8af459..2433771c8 100644 --- a/embassy-net/src/tcp_socket.rs +++ b/embassy-net/src/tcp_socket.rs | |||
| @@ -130,7 +130,7 @@ impl<'a> AsyncBufRead for TcpSocket<'a> { | |||
| 130 | ) -> Poll<io::Result<&'z [u8]>> { | 130 | ) -> Poll<io::Result<&'z [u8]>> { |
| 131 | self.with(|socket| match socket.peek(1 << 30) { | 131 | self.with(|socket| match socket.peek(1 << 30) { |
| 132 | // No data ready | 132 | // No data ready |
| 133 | Ok(buf) if buf.len() == 0 => { | 133 | Ok(buf) if buf.is_empty() => { |
| 134 | socket.register_recv_waker(cx.waker()); | 134 | socket.register_recv_waker(cx.waker()); |
| 135 | Poll::Pending | 135 | Poll::Pending |
| 136 | } | 136 | } |
