diff --git a/hal/rtl8188eu_recv.c b/hal/rtl8188eu_recv.c index ab0853c..f245f94 100644 --- a/hal/rtl8188eu_recv.c +++ b/hal/rtl8188eu_recv.c @@ -54,7 +54,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) struct recv_buf *precvbuf; tasklet_init(&precvpriv->recv_tasklet, - (void(*)(unsigned long))rtl8188eu_recv_tasklet, + (void *)rtl8188eu_recv_tasklet, (unsigned long)padapter); /* init recv_buf */ diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 7f5d677..ca8aa36 100644 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -30,7 +30,7 @@ s32 rtl8188eu_init_xmit_priv(struct adapter *adapt) struct xmit_priv *pxmitpriv = &adapt->xmitpriv; tasklet_init(&pxmitpriv->xmit_tasklet, - (void(*)(unsigned long))rtl8188eu_xmit_tasklet, + (void *)rtl8188eu_xmit_tasklet, (unsigned long)adapt); return _SUCCESS; } diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 541af56..e99e619 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -382,8 +382,11 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname) rtw_init_netdev_name(pnetdev, ifname); +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); - +#else + dev_addr_set(pnetdev, padapter->eeprompriv.mac_addr); +#endif if (!rtnl_is_locked()) ret = register_netdev(pnetdev); else diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index c37cdb3..a482d79 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -691,7 +691,11 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr); #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); +#else + dev_addr_set(pnetdev, padapter->eeprompriv.mac_addr); +#endif DBG_88E("MAC Address from pnetdev->dev_addr = %pM\n", pnetdev->dev_addr);