aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-11-19 22:43:55 +0000
committerGitHub <[email protected]>2023-11-19 22:43:55 +0000
commit3a939fb511fec1edcd786cd356b717ba0870210f (patch)
tree2576d034296992df31e549678bb259e5bed14f65
parentff2f1049b1124bf419d4344da99fa4087efeeca6 (diff)
parentb8e9e00b44665edea6f433788a320c1981f96885 (diff)
Merge pull request #2204 from Slowki/fix/igmp-compile-error
populate `medium` in DriverAdapter struct in IGMP code
-rwxr-xr-xci.sh1
-rw-r--r--embassy-net/src/lib.rs4
2 files changed, 5 insertions, 0 deletions
diff --git a/ci.sh b/ci.sh
index 78a6eeb8a..aff88353c 100755
--- a/ci.sh
+++ b/ci.sh
@@ -38,6 +38,7 @@ cargo batch \
38 --- build --release --manifest-path embassy-sync/Cargo.toml --target thumbv6m-none-eabi --features nightly,defmt \ 38 --- build --release --manifest-path embassy-sync/Cargo.toml --target thumbv6m-none-eabi --features nightly,defmt \
39 --- build --release --manifest-path embassy-time/Cargo.toml --target thumbv6m-none-eabi --features nightly,defmt,defmt-timestamp-uptime,tick-hz-32_768,generic-queue-8 \ 39 --- build --release --manifest-path embassy-time/Cargo.toml --target thumbv6m-none-eabi --features nightly,defmt,defmt-timestamp-uptime,tick-hz-32_768,generic-queue-8 \
40 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet \ 40 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet \
41 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,igmp,medium-ethernet \
41 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet \ 42 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet \
42 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet,nightly,dhcpv4-hostname \ 43 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet,nightly,dhcpv4-hostname \
43 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv6,medium-ethernet \ 44 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv6,medium-ethernet \
diff --git a/embassy-net/src/lib.rs b/embassy-net/src/lib.rs
index 6aa476aa0..58310b203 100644
--- a/embassy-net/src/lib.rs
+++ b/embassy-net/src/lib.rs
@@ -616,9 +616,11 @@ impl<D: Driver> Stack<D> {
616 let addr = addr.into(); 616 let addr = addr.into();
617 617
618 self.with_mut(|s, i| { 618 self.with_mut(|s, i| {
619 let (_hardware_addr, medium) = to_smoltcp_hardware_address(i.device.hardware_address());
619 let mut smoldev = DriverAdapter { 620 let mut smoldev = DriverAdapter {
620 cx: Some(cx), 621 cx: Some(cx),
621 inner: &mut i.device, 622 inner: &mut i.device,
623 medium,
622 }; 624 };
623 625
624 match s 626 match s
@@ -653,9 +655,11 @@ impl<D: Driver> Stack<D> {
653 let addr = addr.into(); 655 let addr = addr.into();
654 656
655 self.with_mut(|s, i| { 657 self.with_mut(|s, i| {
658 let (_hardware_addr, medium) = to_smoltcp_hardware_address(i.device.hardware_address());
656 let mut smoldev = DriverAdapter { 659 let mut smoldev = DriverAdapter {
657 cx: Some(cx), 660 cx: Some(cx),
658 inner: &mut i.device, 661 inner: &mut i.device,
662 medium,
659 }; 663 };
660 664
661 match s 665 match s