From 81f5df97512d46c8dd6c29e5777e6141acb0c224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 4 Jul 2023 09:53:12 +0200 Subject: [PATCH] Upgrade smoltcp to 0.10 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/executor/device.rs | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf728cd4d2..2f3d09e167 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -799,9 +799,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "smoltcp" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9786ac45091b96f946693e05bfa4d8ca93e2d3341237d97a380107a6b38dea" +checksum = "8d2e3a36ac8fea7b94e666dfa3871063d6e0a5c9d5d4fec9a1a6b7b6760f0229" dependencies = [ "bitflags 1.3.2", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 58ebd22f38..189cccc51f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,7 @@ time = { version = "0.3", default-features = false } pci_types = { version = "0.5" } [dependencies.smoltcp] -version = "0.9" +version = "0.10" optional = true default-features = false features = [ diff --git a/src/executor/device.rs b/src/executor/device.rs index 2c2ee7ea45..40cfce4d44 100644 --- a/src/executor/device.rs +++ b/src/executor/device.rs @@ -83,13 +83,13 @@ impl<'a> NetworkInterface<'a> { let dhcp = dhcpv4::Socket::new(); // use the current time based on the wall-clock time as seed - let mut config = Config::new(); + let mut config = Config::new(hardware_addr); config.random_seed = (arch::get_boot_time() + arch::processor::get_timer_ticks()) / 1000000; if device.capabilities().medium == Medium::Ethernet { - config.hardware_addr = Some(hardware_addr); + config.hardware_addr = hardware_addr; } - let iface = Interface::new(config, &mut device); + let iface = Interface::new(config, &mut device, crate::executor::now()); let mut sockets = SocketSet::new(vec![]); let dhcp_handle = sockets.add(dhcp); @@ -148,13 +148,13 @@ impl<'a> NetworkInterface<'a> { info!("MTU: {} bytes", mtu); // use the current time based on the wall-clock time as seed - let mut config = Config::new(); + let mut config = Config::new(hardware_addr); config.random_seed = (arch::get_boot_time() + arch::processor::get_timer_ticks()) / 1000000; if device.capabilities().medium == Medium::Ethernet { - config.hardware_addr = Some(hardware_addr).into(); + config.hardware_addr = hardware_addr; } - let mut iface = Interface::new(config, &mut device); + let mut iface = Interface::new(config, &mut device, crate::executor::now()); iface.update_ip_addrs(|ip_addrs| { ip_addrs .push(IpCidr::new(