Make ethernet address configurable from the Device

2 files changed, 7 insertions, 3 deletions

diff --git a/embassy-net/src/device.rs b/embassy-net/src/device.rs
index ea23635c7..5a266f4ef 100644
--- a/embassy-net/src/device.rs
+++ b/embassy-net/src/device.rs
@@ -21,6 +21,7 @@ pub trait Device {
     fn register_waker(&mut self, waker: &Waker);
     fn capabilities(&mut self) -> DeviceCapabilities;
     fn link_state(&mut self) -> LinkState;
+    fn ethernet_address(&mut self) -> [u8;6];
 }
 
 pub struct DeviceAdapter {
diff --git a/embassy-net/src/stack.rs b/embassy-net/src/stack.rs
index d1dcb3bc9..8f63db971 100644
--- a/embassy-net/src/stack.rs
+++ b/embassy-net/src/stack.rs
@@ -154,15 +154,18 @@ pub fn init(device: &'static mut dyn Device, configurator: &'static mut dyn Conf
         routes: [None; 1],
     });
 
-    let ethernet_addr = EthernetAddress([0x02, 0x02, 0x02, 0x02, 0x02, 0x02]);
-
     let medium = device.capabilities().medium;
+    let ethernet_addr = if medium == Medium::Ethernet {
+        device.ethernet_address()
+    } else {
+        [0, 0, 0, 0, 0, 0]
+    };
 
     let mut b = InterfaceBuilder::new(DeviceAdapter::new(device));
     b = b.ip_addrs(&mut res.addresses[..]);
 
     if medium == Medium::Ethernet {
-        b = b.ethernet_addr(ethernet_addr);
+        b = b.ethernet_addr(EthernetAddress(ethernet_addr));
         b = b.neighbor_cache(NeighborCache::new(&mut res.neighbor_cache[..]));
         b = b.routes(Routes::new(&mut res.routes[..]));
     }