aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--embassy-net/Cargo.toml2
-rw-r--r--embassy-net/src/lib.rs4
-rw-r--r--embassy-net/src/stack.rs13
3 files changed, 9 insertions, 10 deletions
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml
index a62bdde4d..ccfa2906e 100644
--- a/embassy-net/Cargo.toml
+++ b/embassy-net/Cargo.toml
@@ -35,7 +35,7 @@ atomic-pool = "0.2.1"
35 35
36[dependencies.smoltcp] 36[dependencies.smoltcp]
37git = "https://github.com/smoltcp-rs/smoltcp" 37git = "https://github.com/smoltcp-rs/smoltcp"
38rev = "453183f8a1d16daf2f6739b565d3dc7ac93b662e" 38rev = "f5bc05cda8d83595c98688991f4b69fc963a88f6"
39default-features = false 39default-features = false
40features = [ 40features = [
41 "proto-ipv4", 41 "proto-ipv4",
diff --git a/embassy-net/src/lib.rs b/embassy-net/src/lib.rs
index 307179556..c4229446f 100644
--- a/embassy-net/src/lib.rs
+++ b/embassy-net/src/lib.rs
@@ -26,6 +26,8 @@ pub use tcp_socket::TcpSocket;
26pub use smoltcp::phy::{DeviceCapabilities, Medium}; 26pub use smoltcp::phy::{DeviceCapabilities, Medium};
27pub use smoltcp::time::Duration as SmolDuration; 27pub use smoltcp::time::Duration as SmolDuration;
28pub use smoltcp::time::Instant as SmolInstant; 28pub use smoltcp::time::Instant as SmolInstant;
29pub use smoltcp::wire::{HardwareAddress, IpAddress, IpCidr, Ipv4Address, Ipv4Cidr}; 29#[cfg(feature = "medium-ethernet")]
30pub use smoltcp::wire::{EthernetAddress, HardwareAddress};
31pub use smoltcp::wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr};
30pub type Interface = smoltcp::iface::Interface<'static, device::DeviceAdapter>; 32pub type Interface = smoltcp::iface::Interface<'static, device::DeviceAdapter>;
31pub use smoltcp::{Error, Result}; 33pub use smoltcp::{Error, Result};
diff --git a/embassy-net/src/stack.rs b/embassy-net/src/stack.rs
index 610260a8e..f1f92e8ed 100644
--- a/embassy-net/src/stack.rs
+++ b/embassy-net/src/stack.rs
@@ -8,18 +8,15 @@ use embassy::waitqueue::WakerRegistration;
8use futures::pin_mut; 8use futures::pin_mut;
9use smoltcp::iface::InterfaceBuilder; 9use smoltcp::iface::InterfaceBuilder;
10use smoltcp::iface::SocketStorage; 10use smoltcp::iface::SocketStorage;
11use smoltcp::time::Instant as SmolInstant;
12use smoltcp::wire::{IpCidr, Ipv4Address, Ipv4Cidr};
13
11#[cfg(feature = "medium-ethernet")] 14#[cfg(feature = "medium-ethernet")]
12use smoltcp::iface::{Neighbor, NeighborCache, Route, Routes}; 15use smoltcp::iface::{Neighbor, NeighborCache, Route, Routes};
13#[cfg(feature = "medium-ethernet")] 16#[cfg(feature = "medium-ethernet")]
14use smoltcp::phy::Device as _; 17use smoltcp::phy::{Device as _, Medium};
15#[cfg(feature = "medium-ethernet")]
16use smoltcp::phy::Medium;
17use smoltcp::time::Instant as SmolInstant;
18#[cfg(feature = "medium-ethernet")]
19use smoltcp::wire::EthernetAddress;
20#[cfg(feature = "medium-ethernet")] 18#[cfg(feature = "medium-ethernet")]
21use smoltcp::wire::IpAddress; 19use smoltcp::wire::{EthernetAddress, HardwareAddress, IpAddress};
22use smoltcp::wire::{HardwareAddress, IpCidr, Ipv4Address, Ipv4Cidr};
23 20
24use crate::config::Configurator; 21use crate::config::Configurator;
25use crate::config::Event; 22use crate::config::Event;