From 09ba98c7d3a5bdea4a7df5c385efc46bc28b467e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garc=C3=A9s?= Date: Sun, 2 Jul 2023 12:11:29 +0000 Subject: [PATCH] Use eth_hw_addr_set instead of dev_addr_set --- include/drv_types_linux.h | 6 +++++- os_dep/linux/ioctl_linux.c | 2 +- os_dep/linux/mlme_linux.c | 2 +- os_dep/linux/os_intfs.c | 4 ++-- os_dep/osdep_service.c | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/drv_types_linux.h b/include/drv_types_linux.h index 3d428d4d0..97c8576a2 100644 --- a/include/drv_types_linux.h +++ b/include/drv_types_linux.h @@ -16,7 +16,11 @@ #define __DRV_TYPES_LINUX_H__ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)) -#define dev_addr_set(netdev, ethdata) _rtw_memcpy(netdev->dev_addr, ethdata, ETH_ALEN) +/* Porting from linux kernel v5.15 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 3f6cffb8604b537e3d7ea040d7f4368689638eaf*/ +static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) +{ + memcpy(dev->dev_addr, addr, ETH_ALEN) +} #endif #endif diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index b2a7560d9..c5776117f 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -9725,7 +9725,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, rtw_hal_read_chip_info(padapter); /* set mac addr*/ rtw_macaddr_cfg(adapter_mac_addr(padapter), get_hal_mac_addr(padapter)); - dev_addr_set(padapter->pnetdev, get_hal_mac_addr(padapter)); /* set mac addr to net_device */ + eth_hw_addr_set(padapter->pnetdev, get_hal_mac_addr(padapter)); /* set mac addr to net_device */ #ifdef CONFIG_P2P rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter)); diff --git a/os_dep/linux/mlme_linux.c b/os_dep/linux/mlme_linux.c index 771c6272e..74f098277 100644 --- a/os_dep/linux/mlme_linux.c +++ b/os_dep/linux/mlme_linux.c @@ -404,7 +404,7 @@ int hostapd_mode_init(_adapter *padapter) mac[4] = 0x11; mac[5] = 0x12; - dev_addr_set(pnetdev, mac); + eth_hw_addr_set(pnetdev, mac); rtw_netif_carrier_off(pnetdev); diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 6d2801357..2dadae098 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1285,7 +1285,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *addr) } _rtw_memcpy(adapter_mac_addr(padapter), sa->sa_data, ETH_ALEN); /* set mac addr to adapter */ - dev_addr_set(pnetdev, sa->sa_data); /* set mac addr to net_device */ + eth_hw_addr_set(pnetdev, sa->sa_data); /* set mac addr to net_device */ #if 0 if (rtw_is_hw_init_completed(padapter)) { @@ -1754,7 +1754,7 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name) /* alloc netdev name */ rtw_init_netdev_name(ndev, name); - dev_addr_set(ndev, adapter_mac_addr(adapter)); + eth_hw_addr_set(ndev, adapter_mac_addr(adapter)); #if defined(CONFIG_NET_NS) dev_net_set(ndev, wiphy_net(adapter_to_wiphy(adapter))); #endif //defined(CONFIG_NET_NS) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 7553f2c98..d24b3e1f0 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -2299,7 +2299,7 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname) rtw_init_netdev_name(pnetdev, ifname); - dev_addr_set(pnetdev, adapter_mac_addr(padapter)); + eth_hw_addr_set(pnetdev, adapter_mac_addr(padapter)); if (rtnl_lock_needed) ret = register_netdev(pnetdev);