|
@@ -1241,7 +1241,11 @@ 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 */
|
|
_rtw_memcpy(adapter_mac_addr(padapter), sa->sa_data, ETH_ALEN); /* set mac addr to adapter */
|
|
|
|
|
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
|
|
_rtw_memcpy(pnetdev->dev_addr, sa->sa_data, ETH_ALEN); /* set mac addr to net_device */
|
|
_rtw_memcpy(pnetdev->dev_addr, sa->sa_data, ETH_ALEN); /* set mac addr to net_device */
|
|
|
|
|
+ #else
|
|
|
|
|
+ eth_hw_addr_set(pnetdev, sa->sa_data);
|
|
|
|
|
+ #endif
|
|
|
|
|
|
|
|
#if 0
|
|
#if 0
|
|
|
if (rtw_is_hw_init_completed(padapter)) {
|
|
if (rtw_is_hw_init_completed(padapter)) {
|
|
@@ -1703,7 +1707,11 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
|
|
|
/* alloc netdev name */
|
|
/* alloc netdev name */
|
|
|
rtw_init_netdev_name(ndev, name);
|
|
rtw_init_netdev_name(ndev, name);
|
|
|
|
|
|
|
|
|
|
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
|
|
_rtw_memcpy(ndev->dev_addr, adapter_mac_addr(adapter), ETH_ALEN);
|
|
_rtw_memcpy(ndev->dev_addr, adapter_mac_addr(adapter), ETH_ALEN);
|
|
|
|
|
+ #else
|
|
|
|
|
+ eth_hw_addr_set(ndev, adapter_mac_addr(adapter));
|
|
|
|
|
+ #endif
|
|
|
|
|
|
|
|
/* Tell the network stack we exist */
|
|
/* Tell the network stack we exist */
|
|
|
|
|
|
|
@@ -2671,7 +2679,11 @@ int _netdev_vir_if_open(struct net_device *pnetdev)
|
|
|
rtw_mbid_camid_alloc(padapter, adapter_mac_addr(padapter));
|
|
rtw_mbid_camid_alloc(padapter, adapter_mac_addr(padapter));
|
|
|
#endif
|
|
#endif
|
|
|
rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));
|
|
rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));
|
|
|
|
|
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
|
|
_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
|
|
_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
|
|
|
|
|
+ #else
|
|
|
|
|
+ eth_hw_addr_set(pnetdev, adapter_mac_addr(padapter));
|
|
|
|
|
+ #endif
|
|
|
}
|
|
}
|
|
|
#endif /*CONFIG_PLATFORM_INTEL_BYT*/
|
|
#endif /*CONFIG_PLATFORM_INTEL_BYT*/
|
|
|
|
|
|
|
@@ -3420,7 +3432,11 @@ int _netdev_open(struct net_device *pnetdev)
|
|
|
rtw_mbid_camid_alloc(padapter, adapter_mac_addr(padapter));
|
|
rtw_mbid_camid_alloc(padapter, adapter_mac_addr(padapter));
|
|
|
#endif
|
|
#endif
|
|
|
rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));
|
|
rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));
|
|
|
|
|
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
|
|
_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
|
|
_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
|
|
|
|
|
+ #else
|
|
|
|
|
+ eth_hw_addr_set(pnetdev, adapter_mac_addr(padapter));
|
|
|
|
|
+ #endif
|
|
|
#endif /* CONFIG_PLATFORM_INTEL_BYT */
|
|
#endif /* CONFIG_PLATFORM_INTEL_BYT */
|
|
|
|
|
|
|
|
rtw_clr_surprise_removed(padapter);
|
|
rtw_clr_surprise_removed(padapter);
|