From 0e7419450ec926227cc577f1b8b322ad9686f42c Mon Sep 17 00:00:00 2001 From: whitequark Date: Mon, 20 Aug 2018 00:26:31 +0000 Subject: [PATCH] firmware: update smoltcp. This adds TCP window scaling support. --- artiq/firmware/Cargo.lock | 10 +++++----- artiq/firmware/bootloader/Cargo.toml | 2 +- artiq/firmware/libboard_misoc/Cargo.toml | 2 +- artiq/firmware/runtime/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/artiq/firmware/Cargo.lock b/artiq/firmware/Cargo.lock index 885310773..de1abb72b 100644 --- a/artiq/firmware/Cargo.lock +++ b/artiq/firmware/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=2139686)", + "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)", ] [[package]] @@ -42,7 +42,7 @@ dependencies = [ "build_misoc 0.0.0", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=2139686)", + "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)", ] [[package]] @@ -216,7 +216,7 @@ dependencies = [ "logger_artiq 0.0.0", "managed 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "proto_artiq 0.0.0", - "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=2139686)", + "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)", "unwind_backtrace 0.0.0", ] @@ -233,7 +233,7 @@ dependencies = [ [[package]] name = "smoltcp" version = "0.4.0" -source = "git+https://github.com/m-labs/smoltcp?rev=2139686#21396867114d267da06f19cc54cc4a1883b900a5" +source = "git+https://github.com/m-labs/smoltcp?rev=92e970b#92e970b3798737cfaa2a829d3f1bb7a7353696ee" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -294,7 +294,7 @@ version = "0.0.0" "checksum log_buffer 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f033173c9486b7fe97a79c895c0a3483ae395ab6744c985d10078950e2492419" "checksum managed 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba6713e624266d7600e9feae51b1926c6a6a6bebb18ec5a8e11a5f1d5661baba" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -"checksum smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=2139686)" = "" +"checksum smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)" = "" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" "checksum synstructure 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd" diff --git a/artiq/firmware/bootloader/Cargo.toml b/artiq/firmware/bootloader/Cargo.toml index 5ab62863a..be9ab36e9 100644 --- a/artiq/firmware/bootloader/Cargo.toml +++ b/artiq/firmware/bootloader/Cargo.toml @@ -19,6 +19,6 @@ board_misoc = { path = "../libboard_misoc", features = ["uart_console", "smoltcp [dependencies.smoltcp] git = "https://github.com/m-labs/smoltcp" -rev = "2139686" +rev = "92e970b" default-features = false features = ["proto-ipv4", "socket-tcp"] diff --git a/artiq/firmware/libboard_misoc/Cargo.toml b/artiq/firmware/libboard_misoc/Cargo.toml index 1efd23a4e..aae40b6b1 100644 --- a/artiq/firmware/libboard_misoc/Cargo.toml +++ b/artiq/firmware/libboard_misoc/Cargo.toml @@ -18,7 +18,7 @@ log = { version = "0.4", default-features = false, optional = true } [dependencies.smoltcp] git = "https://github.com/m-labs/smoltcp" -rev = "2139686" # NB: also change in runtime/Cargo.toml +rev = "92e970b" # NB: also change in runtime/Cargo.toml default-features = false optional = true diff --git a/artiq/firmware/runtime/Cargo.toml b/artiq/firmware/runtime/Cargo.toml index 8be210b35..1a7da3375 100644 --- a/artiq/firmware/runtime/Cargo.toml +++ b/artiq/firmware/runtime/Cargo.toml @@ -36,6 +36,6 @@ features = ["alloc"] [dependencies.smoltcp] git = "https://github.com/m-labs/smoltcp" -rev = "2139686" # NB: also change in libboard_misoc/Cargo.toml +rev = "92e970b" # NB: also change in libboard_misoc/Cargo.toml default-features = false features = ["rust-1.28", "alloc", "log", "proto-ipv4", "socket-tcp"]