diff --git a/devices/ccat/netdev.c b/devices/ccat/netdev.c
index b006d8f5..86bb1471 100644
--- a/devices/ccat/netdev.c
+++ b/devices/ccat/netdev.c
@@ -894,8 +894,18 @@ static int ccat_eth_init_netdev(struct ccat_eth_priv *priv)
 	int status;
 
 	/* init netdev with MAC and stack callbacks */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+	u8 mac_addr[ETH_ALEN];
+
+	if (priv->netdev->addr_len != ETH_ALEN)
+		return -EFAULT;
+	memcpy_fromio(mac_addr, priv->reg.mii + 8, ETH_ALEN);
+	eth_hw_addr_set(priv->netdev, mac_addr);
+#else
 	memcpy_fromio(priv->netdev->dev_addr, priv->reg.mii + 8,
 		      priv->netdev->addr_len);
+#endif
 	priv->netdev->netdev_ops = &ccat_eth_netdev_ops;
 
 	/* use as EtherCAT device? */
diff --git a/devices/generic.c b/devices/generic.c
index 0feab284..4d4d9bbd 100644
--- a/devices/generic.c
+++ b/devices/generic.c
@@ -255,7 +255,11 @@ int ec_gen_device_offer(
     int ret = 0;
 
     dev->used_netdev = desc->netdev;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+    eth_hw_addr_set(dev->netdev, desc->dev_addr);
+#else
     memcpy(dev->netdev->dev_addr, desc->dev_addr, ETH_ALEN);
+#endif
 
     dev->ecdev = ecdev_offer(dev->netdev, ec_gen_poll, THIS_MODULE);
     if (dev->ecdev) {
diff --git a/master/debug.c b/master/debug.c
index ad5f90eb..b4bfc442 100644
--- a/master/debug.c
+++ b/master/debug.c
@@ -134,7 +134,11 @@ void ec_debug_register(
     ec_debug_unregister(dbg);
 
     // use the Ethernet address of the physical device for the debug device
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+    eth_hw_addr_set(dbg->dev, net_dev->dev_addr);
+#else
     memcpy(dbg->dev->dev_addr, net_dev->dev_addr, ETH_ALEN);
+#endif
 
     // connect the net_device to the kernel
     if ((result = register_netdev(dbg->dev))) {
diff --git a/master/ethernet.c b/master/ethernet.c
index 86a961a7..f78d1d11 100644
--- a/master/ethernet.c
+++ b/master/ethernet.c
@@ -113,7 +113,11 @@ ec_eoedev_set_mac(struct net_device *netdev, void *p)
       return -EADDRNOTAVAIL;
    }
 
-   memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+    eth_hw_addr_set(netdev, addr->sa_data);
+#else
+    memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+#endif
 
    return 0;
 }
@@ -134,6 +138,7 @@ int ec_eoe_init(
     ec_eoe_t **priv;
     int ret = 0;
     char name[EC_DATAGRAM_NAME_SIZE];
+    u8 mac_addr[ETH_ALEN];
 
     struct net_device *dev;
     unsigned char lo_mac[ETH_ALEN] = {0};
@@ -233,9 +238,9 @@ int ec_eoe_init(
                 EC_SLAVE_INFO(slave, "%s MAC address derived from"
                         " NIC part of %s MAC address",
                     eoe->dev->name, dev->name);
-                eoe->dev->dev_addr[1] = dev->dev_addr[3];
-                eoe->dev->dev_addr[2] = dev->dev_addr[4];
-                eoe->dev->dev_addr[3] = dev->dev_addr[5];
+                mac_addr[1] = dev->dev_addr[3];
+                mac_addr[2] = dev->dev_addr[4];
+                mac_addr[3] = dev->dev_addr[5];
             }
             else {
                 use_master_mac = 1;
@@ -248,16 +253,23 @@ int ec_eoe_init(
                     " from NIC part of %s MAC address",
                 eoe->dev->name,
                 slave->master->devices[EC_DEVICE_MAIN].dev->name);
-            eoe->dev->dev_addr[1] =
+            mac_addr[1] =
                 slave->master->devices[EC_DEVICE_MAIN].dev->dev_addr[3];
-            eoe->dev->dev_addr[2] =
+            mac_addr[2] =
                 slave->master->devices[EC_DEVICE_MAIN].dev->dev_addr[4];
-            eoe->dev->dev_addr[3] =
+            mac_addr[3] =
                 slave->master->devices[EC_DEVICE_MAIN].dev->dev_addr[5];
         }
-        eoe->dev->dev_addr[0] = 0x02;
-        eoe->dev->dev_addr[4] = (uint8_t)(slave->ring_position >> 8);
-        eoe->dev->dev_addr[5] = (uint8_t)(slave->ring_position);
+        //eoe->dev->dev_addr[0] = 0x02;
+        mac_addr[0] = 0x02;
+        mac_addr[4] = (uint8_t)(slave->ring_position >> 8);
+        mac_addr[5] = (uint8_t)(slave->ring_position);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+        eth_hw_addr_set(eoe->dev, mac_addr);
+#else
+        memcpy(eoe->dev->dev_addr, mac_addr, sizeof(mac_addr));
+#endif
     }
 
     // initialize private data