From 916e9407803b402c144b2d81560954c2b6101649 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 5 Sep 2017 17:26:23 +0800
Subject: [PATCH] update smoltcp

---
 firmware/Cargo.lock  | 6 +++---
 firmware/Cargo.toml  | 2 +-
 firmware/src/main.rs | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock
index f0f9da1..8b12a1a 100644
--- a/firmware/Cargo.lock
+++ b/firmware/Cargo.lock
@@ -4,7 +4,7 @@ version = "1.0.0"
 dependencies = [
  "cortex-m 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m-rt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smoltcp 0.4.0-pre (git+https://github.com/m-labs/smoltcp?rev=d03ea64)",
+ "smoltcp 0.4.0-pre (git+https://github.com/m-labs/smoltcp?rev=962180b)",
  "tm4c129x 0.5.0 (git+https://github.com/m-labs/dslite2svd?rev=d527f3f)",
  "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -74,7 +74,7 @@ dependencies = [
 [[package]]
 name = "smoltcp"
 version = "0.4.0-pre"
-source = "git+https://github.com/m-labs/smoltcp?rev=d03ea64#d03ea6426b0524af726bfc4eb6fa025af475622f"
+source = "git+https://github.com/m-labs/smoltcp?rev=962180b#962180b71c9273ae77bef3d22eca8144280e4949"
 dependencies = [
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "managed 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -134,7 +134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum managed 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61eb783b4fa77e8fa4d27ec400f97ed9168546b8b30341a120b7ba9cc6571aaf"
 "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f"
 "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
-"checksum smoltcp 0.4.0-pre (git+https://github.com/m-labs/smoltcp?rev=d03ea64)" = "<none>"
+"checksum smoltcp 0.4.0-pre (git+https://github.com/m-labs/smoltcp?rev=962180b)" = "<none>"
 "checksum tm4c129x 0.5.0 (git+https://github.com/m-labs/dslite2svd?rev=d527f3f)" = "<none>"
 "checksum vcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45c297f0afb6928cd08ab1ff9d95e99392595ea25ae1b5ecf822ff8764e57a0d"
 "checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"
diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml
index c741700..9f8938f 100644
--- a/firmware/Cargo.toml
+++ b/firmware/Cargo.toml
@@ -17,7 +17,7 @@ features = ["rt"]
 
 [dependencies.smoltcp]
 git = "https://github.com/m-labs/smoltcp"
-rev = "d03ea64"
+rev = "962180b"
 features = []
 default-features = false
 
diff --git a/firmware/src/main.rs b/firmware/src/main.rs
index c73cc2d..fbc378c 100644
--- a/firmware/src/main.rs
+++ b/firmware/src/main.rs
@@ -10,7 +10,6 @@ extern crate smoltcp;
 use core::cell::{Cell, RefCell};
 use core::fmt;
 use cortex_m::interrupt::Mutex;
-use smoltcp::Error;
 use smoltcp::wire::EthernetAddress;
 use smoltcp::iface::{ArpCache, SliceArpCache, EthernetInterface};
 use smoltcp::socket::{AsSocket, SocketSet};
@@ -244,7 +243,7 @@ fn main() {
             }
         }
         match iface.poll(&mut sockets, time) {
-            Ok(()) | Err(Error::Exhausted) => (),
+            Ok(_) => (),
             Err(e) => println!("poll error: {}", e)
         }