From 524eed5db57c73fe06777283f5992bc514f8fc50 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Fri, 26 Nov 2021 20:39:21 +0100
Subject: Update smoltcp, fix build issues with no ethernet.

---
 embassy-net/src/lib.rs   |  4 +++-
 embassy-net/src/stack.rs | 13 +++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'embassy-net/src')

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;
 pub use smoltcp::phy::{DeviceCapabilities, Medium};
 pub use smoltcp::time::Duration as SmolDuration;
 pub use smoltcp::time::Instant as SmolInstant;
-pub use smoltcp::wire::{HardwareAddress, IpAddress, IpCidr, Ipv4Address, Ipv4Cidr};
+#[cfg(feature = "medium-ethernet")]
+pub use smoltcp::wire::{EthernetAddress, HardwareAddress};
+pub use smoltcp::wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr};
 pub type Interface = smoltcp::iface::Interface<'static, device::DeviceAdapter>;
 pub 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;
 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