Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-05 19:39:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix setting mac_address

Browse Source 
eoe->dev->dev_addr is read_only in 5.17.0
using eth_hw_addr_set instead
This commit is contained in:
Bjarne von Horn
2022-05-01 16:39:10 +02:00
committed by Florian Pose
parent 54814b770e
commit d301cbb992
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devices/ccat/netdev.c
View File

@@ -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? */

4
devices/generic.c
View File

@@ -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) {

4
master/debug.c
View File

@@ -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))) {

18
master/ethernet.c
View File

@@ -107,8 +107,9 @@ int ec_eoe_init(
)
{
ec_eoe_t **priv;
int i, ret = 0;
int ret = 0;
char name[EC_DATAGRAM_NAME_SIZE];
u8 mac_addr[ETH_ALEN] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55};
eoe->slave = slave;
@@ -171,8 +172,11 @@ int ec_eoe_init(
eoe->dev->get_stats = ec_eoedev_stats;
#endif
for (i = 0; i < ETH_ALEN; i++)
eoe->dev->dev_addr[i] = i | (i << 4);
#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
priv = netdev_priv(eoe->dev);
@@ -195,7 +199,13 @@ int ec_eoe_init(
}
// make the last address octet unique
eoe->dev->dev_addr[ETH_ALEN - 1] = (uint8_t) eoe->dev->ifindex;
mac_addr[ETH_ALEN - 1] = (uint8_t) eoe->dev->ifindex;
#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
return 0;
out_free: