diff --git a/uefi-test-runner/src/proto/network/snp.rs b/uefi-test-runner/src/proto/network/snp.rs index 1aa85c6e..fb6ca91e 100644 --- a/uefi-test-runner/src/proto/network/snp.rs +++ b/uefi-test-runner/src/proto/network/snp.rs @@ -6,9 +6,9 @@ use smoltcp::wire::{ ETHERNET_HEADER_LEN, EthernetFrame, IPV4_HEADER_LEN, Ipv4Packet, UDP_HEADER_LEN, UdpPacket, }; use uefi::boot::ScopedProtocol; +use uefi::proto::network::EfiMacAddr; use uefi::proto::network::snp::{InterruptStatus, ReceiveFlags, SimpleNetwork}; use uefi::{Status, boot}; -use uefi_raw::MacAddress as EfiMacAddr; use uefi_raw::protocol::network::snp::NetworkState; /// The MAC address configured for the interface. diff --git a/uefi/src/proto/network/mod.rs b/uefi/src/proto/network/mod.rs index 154bd409..58f7eefc 100644 --- a/uefi/src/proto/network/mod.rs +++ b/uefi/src/proto/network/mod.rs @@ -10,7 +10,8 @@ //! - [`Ipv6Addr`] //! //! The only exception is [`uefi_raw::MacAddress`] which doesn't have a -//! corresponding type in the standard library. +//! corresponding type in the standard library. It is re-exported as +//! [`EfiMacAddr`]. //! //! [`IpAddr`]: core::net::IpAddr //! [`Ipv4Addr`]: core::net::Ipv4Addr @@ -20,3 +21,5 @@ pub mod http; pub mod ip4config2; pub mod pxe; pub mod snp; + +pub use uefi_raw::MacAddress as EfiMacAddr; diff --git a/uefi/src/proto/network/pxe.rs b/uefi/src/proto/network/pxe.rs index 8350ec8f..2c479e4e 100644 --- a/uefi/src/proto/network/pxe.rs +++ b/uefi/src/proto/network/pxe.rs @@ -14,11 +14,12 @@ use core::net::{IpAddr, Ipv4Addr}; use core::ptr::{self, null, null_mut}; use core::slice; use ptr_meta::Pointee; +use uefi::proto::network::EfiMacAddr; use uefi_raw::protocol::network::pxe::{ PxeBaseCodeDiscoverInfo, PxeBaseCodeIpFilter, PxeBaseCodeMode, PxeBaseCodeMtftpInfo, PxeBaseCodePacket, PxeBaseCodeProtocol, PxeBaseCodeTftpOpcode, }; -use uefi_raw::{Boolean, Char8, IpAddress as EfiIpAddr, MacAddress as EfiMacAddr}; +use uefi_raw::{Boolean, Char8, IpAddress as EfiIpAddr}; pub use uefi_raw::protocol::network::pxe::{ PxeBaseCodeBootType as BootstrapType, PxeBaseCodeIpFilterFlags as IpFilters,