From 2d9799b9ec9dbf4ab2a6998c8217788fce06bcc7 Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Sun, 27 Jun 2021 15:16:55 +0200 Subject: [PATCH 1/2] Update smoltcp crate --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b5d19f9b..fed8b0204 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,9 +358,9 @@ dependencies = [ [[package]] name = "smoltcp" -version = "0.6.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a" +checksum = "a4ec49aa038736b0bc852ccd9a0eadc8f7832fe8f9c8eec4e8a740b36d665614" dependencies = [ "bitflags", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 42c179cd5..ed6b46b9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ rand_chacha = { version = "0.3.0", default-features = false } rand_core = { version = "0.6.0", default-features = false } raw-cpuid = "9.0.0" sha2 = { version = "0.8.2", default-features = false } -smoltcp = { version = "0.6.0", default-features = false, features = ["alloc", "ethernet", "socket-tcp", "socket-udp", "proto-ipv4", "proto-dhcpv4"] } +smoltcp = { version = "0.7.4", default-features = false, features = ["alloc", "ethernet", "socket-tcp", "socket-udp", "proto-ipv4", "proto-dhcpv4"] } spin = "0.7.0" uart_16550 = "0.2.15" volatile = "0.2.6" From e7c089da02fdabf2f75e08755f932a4130ab3117 Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Sun, 27 Jun 2021 15:18:16 +0200 Subject: [PATCH 2/2] Update code --- src/kernel/net/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/net/mod.rs b/src/kernel/net/mod.rs index 9a9f51805..e4dfe11a2 100644 --- a/src/kernel/net/mod.rs +++ b/src/kernel/net/mod.rs @@ -4,7 +4,7 @@ use lazy_static::lazy_static; use spin::Mutex; // TODO: Support dyn EthernetInterface -pub type EthernetInterface = smoltcp::iface::EthernetInterface<'static, 'static, 'static, T>; +pub type EthernetInterface = smoltcp::iface::EthernetInterface<'static, T>; #[cfg(feature = "rtl8139")] pub mod rtl8139;