aboutsummaryrefslogtreecommitdiff
path: root/embassy-net/src
diff options
context:
space:
mode:
authorRuben De Smet <[email protected]>2023-07-31 12:20:13 +0200
committerRuben De Smet <[email protected]>2023-07-31 14:21:26 +0200
commit9f55228be07cb4edf680a57afc0fefd69fed7742 (patch)
tree47c26c58df50fbd9cb1b182598cd5261c905a63a /embassy-net/src
parent83ff3cbc69875f93c5a9bb36825c12df39f04f71 (diff)
Use hardware_address() for all media
Diffstat (limited to 'embassy-net/src')
-rw-r--r--embassy-net/src/lib.rs20
1 files changed, 2 insertions, 18 deletions
diff --git a/embassy-net/src/lib.rs b/embassy-net/src/lib.rs
index 746acae46..86a11e92e 100644
--- a/embassy-net/src/lib.rs
+++ b/embassy-net/src/lib.rs
@@ -34,7 +34,7 @@ use smoltcp::iface::{Interface, SocketHandle, SocketSet, SocketStorage};
34use smoltcp::socket::dhcpv4::{self, RetryConfig}; 34use smoltcp::socket::dhcpv4::{self, RetryConfig};
35#[cfg(feature = "medium-ethernet")] 35#[cfg(feature = "medium-ethernet")]
36pub use smoltcp::wire::EthernetAddress; 36pub use smoltcp::wire::EthernetAddress;
37#[cfg(any(feature = "medium-ethernet", feature = "medium-ieee802154"))] 37#[cfg(any(feature = "medium-ethernet", feature = "medium-ieee802154", feature = "medium-ip"))]
38pub use smoltcp::wire::HardwareAddress; 38pub use smoltcp::wire::HardwareAddress;
39#[cfg(feature = "udp")] 39#[cfg(feature = "udp")]
40pub use smoltcp::wire::IpListenEndpoint; 40pub use smoltcp::wire::IpListenEndpoint;
@@ -252,23 +252,7 @@ impl<D: Driver + 'static> Stack<D> {
252 resources: &'static mut StackResources<SOCK>, 252 resources: &'static mut StackResources<SOCK>,
253 random_seed: u64, 253 random_seed: u64,
254 ) -> Self { 254 ) -> Self {
255 #[cfg(any(feature = "medium-ethernet", feature = "medium-ieee802154"))] 255 let mut iface_cfg = smoltcp::iface::Config::new(to_smoltcp_hardware_address(device.hardware_address()));
256 let medium = device.capabilities().medium;
257
258 let hardware_addr = match medium {
259 #[cfg(feature = "medium-ethernet")]
260 Medium::Ethernet => to_smoltcp_hardware_address(device.hardware_address()),
261 #[cfg(feature = "medium-ip")]
262 Medium::Ip => HardwareAddress::Ip,
263 #[cfg(feature = "medium-ieee802154")]
264 Medium::Ieee802154 => to_smoltcp_hardware_address(device.hardware_address()),
265 #[allow(unreachable_patterns)]
266 _ => panic!(
267 "Unsupported medium {:?}. Make sure to enable it in embassy-net's Cargo features.",
268 medium
269 ),
270 };
271 let mut iface_cfg = smoltcp::iface::Config::new(hardware_addr);
272 iface_cfg.random_seed = random_seed; 256 iface_cfg.random_seed = random_seed;
273 257
274 let iface = Interface::new( 258 let iface = Interface::new(