rtl8192ee: Fix for changes in kernel 5.17 API

Signed-off-by: Larry Finger <[email protected]>
kelebek333 · Feb 3, 2022 · 951b543 · 951b543
1 parent 6d8cc4d
commit 951b543
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/hal/rtl8192e/pci/rtl8192ee_recv.c b/hal/rtl8192e/pci/rtl8192ee_recv.c
@@ -26,11 +26,11 @@ s32 rtl8192ee_init_recv_priv(_adapter *padapter)
 
 #ifdef PLATFORM_LINUX
  tasklet_init(&precvpriv->recv_tasklet,
- (void(*)(unsigned long))rtl8192ee_recv_tasklet,
+ (void *)rtl8192ee_recv_tasklet,
  (unsigned long)padapter);
 
  tasklet_init(&precvpriv->irq_prepare_beacon_tasklet,
- (void(*)(unsigned long))rtl8192ee_prepare_bcn_tasklet,
+ (void *)rtl8192ee_prepare_bcn_tasklet,
  (unsigned long)padapter);
 #endif
 

diff --git a/hal/rtl8192e/pci/rtl8192ee_xmit.c b/hal/rtl8192e/pci/rtl8192ee_xmit.c
@@ -37,7 +37,7 @@ s32 rtl8192ee_init_xmit_priv(_adapter *padapter)
 
 #ifdef PLATFORM_LINUX
  tasklet_init(&pxmitpriv->xmit_tasklet,
- (void(*)(unsigned long))rtl8192ee_xmit_tasklet,
+ (void *)rtl8192ee_xmit_tasklet,
  (unsigned long)padapter);
 #endif
 

diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c
@@ -10029,7 +10029,11 @@ 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));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
  _rtw_memcpy(padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */
+#else
+ dev_addr_set(padapter->pnetdev, get_hal_mac_addr(padapter)); /* set mac addr to net_device */
+#endif
 
 #ifdef CONFIG_P2P
  rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));

diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
@@ -1178,7 +1178,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 */
+#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 */
+#else
+ dev_addr_set(pnetdev, sa->sa_data); /* set mac addr to net_device */
+#endif
 
 #if 0
  if (rtw_is_hw_init_completed(padapter)) {
@@ -1592,7 +1596,11 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
  /* alloc netdev 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);
+#else
+ dev_addr_set(ndev, adapter_mac_addr(adapter));
+#endif
 
  /* Tell the network stack we exist */
 

diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
@@ -2332,7 +2332,11 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname)
 
  rtw_init_netdev_name(pnetdev, ifname);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
  _rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
+#else
+ dev_addr_set(pnetdev, adapter_mac_addr(padapter));
+#endif
 
  if (rtnl_lock_needed)
  ret = register_netdev(pnetdev);