From 32bdc54ccba9291b6aafc3c2695a8368d8137bb4 Mon Sep 17 00:00:00 2001
From: Davide Della Giustina <davide@dellagiustina.com>
Date: Tue, 24 Jan 2023 08:27:53 +0000
Subject: [PATCH 1/2] Changed crates' names for nrf examples since they were
 conflicting

---
 examples/nrf52840/Cargo.toml | 2 +-
 examples/nrf5340/Cargo.toml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/nrf52840/Cargo.toml b/examples/nrf52840/Cargo.toml
index 994823a9e..bbd8a5d2f 100644
--- a/examples/nrf52840/Cargo.toml
+++ b/examples/nrf52840/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "embassy-nrf-examples"
+name = "embassy-nrf52840-examples"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 
diff --git a/examples/nrf5340/Cargo.toml b/examples/nrf5340/Cargo.toml
index 03485711e..eed493012 100644
--- a/examples/nrf5340/Cargo.toml
+++ b/examples/nrf5340/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "embassy-nrf-examples"
+name = "embassy-nrf5340-examples"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 

From 2a0ea52878ece15fa12c9d70da32b5809aa1e713 Mon Sep 17 00:00:00 2001
From: Ulf Lilleengen <lulf@redhat.com>
Date: Tue, 24 Jan 2023 09:57:26 +0100
Subject: [PATCH 2/2] add missing copy of icmpv6 checksum

add proto-ipv6 feature to stm32h7 example to catch issues in CI
---
 embassy-net/src/device.rs   | 4 ++++
 examples/stm32h7/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/embassy-net/src/device.rs b/embassy-net/src/device.rs
index 650af23b8..5daa00544 100644
--- a/embassy-net/src/device.rs
+++ b/embassy-net/src/device.rs
@@ -60,6 +60,10 @@ where
         smolcaps.checksum.tcp = convert(caps.checksum.tcp);
         smolcaps.checksum.udp = convert(caps.checksum.udp);
         smolcaps.checksum.icmpv4 = convert(caps.checksum.icmpv4);
+        #[cfg(feature = "proto-ipv6")]
+        {
+            smolcaps.checksum.icmpv6 = convert(caps.checksum.icmpv6);
+        }
 
         smolcaps
     }
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index ff38440a7..bcf976416 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -9,7 +9,7 @@ embassy-sync = { version = "0.1.0", path = "../../embassy-sync", features = ["de
 embassy-executor = { version = "0.1.0", path = "../../embassy-executor", features = ["defmt", "integrated-timers"] }
 embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] }
 embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] }
-embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "unstable-traits"] }
+embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "unstable-traits", "proto-ipv6"] }
 embedded-io = { version = "0.4.0", features = ["async"] }
 embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] }