From 524eed5db57c73fe06777283f5992bc514f8fc50 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Fri, 26 Nov 2021 20:39:21 +0100 Subject: Update smoltcp, fix build issues with no ethernet. --- embassy-net/src/stack.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'embassy-net/src/stack.rs') 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; use futures::pin_mut; use smoltcp::iface::InterfaceBuilder; use smoltcp::iface::SocketStorage; +use smoltcp::time::Instant as SmolInstant; +use smoltcp::wire::{IpCidr, Ipv4Address, Ipv4Cidr}; + #[cfg(feature = "medium-ethernet")] use smoltcp::iface::{Neighbor, NeighborCache, Route, Routes}; #[cfg(feature = "medium-ethernet")] -use smoltcp::phy::Device as _; -#[cfg(feature = "medium-ethernet")] -use smoltcp::phy::Medium; -use smoltcp::time::Instant as SmolInstant; -#[cfg(feature = "medium-ethernet")] -use smoltcp::wire::EthernetAddress; +use smoltcp::phy::{Device as _, Medium}; #[cfg(feature = "medium-ethernet")] -use smoltcp::wire::IpAddress; -use smoltcp::wire::{HardwareAddress, IpCidr, Ipv4Address, Ipv4Cidr}; +use smoltcp::wire::{EthernetAddress, HardwareAddress, IpAddress}; use crate::config::Configurator; use crate::config::Event; -- cgit