Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Another hasty fix for 6.1 kernel #202

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

ylxdzsw
Copy link

@ylxdzsw ylxdzsw commented Dec 23, 2022

  • use get_random_u32() to replace the disappeared prandom_u32()
  • added various link_id arguments to match the new function signature from here

@@ -1643,7 +1643,7 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);

#ifdef CONFIG_RTW_NAPI
netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference, the netif_napi_add with a given weight was renamed to netif_napi_add_weight in linux 6.1.

@iQiexie
Copy link

iQiexie commented Jan 13, 2023

doesn't work for 6.1.5 :(

 71 /var/lib/dkms/rtl8821CU/5.4.1/build/os_dep/osdep_service.c:2618:16: error: implicit declaration of function ‘prandom_u32’; did you mean ‘prandom_u32_max’? [-Werror=implicit-function-declaration]
 72  2618 |         return prandom_u32();
 73       |                ^~~~~~~~~~~
 74       |                prandom_u32_max
 75 cc1: some warnings being treated as errors
 76 make[2]: *** [scripts/Makefile.build:250: /var/lib/dkms/rtl8821CU/5.4.1/build/os_dep/osdep_service.o] Error 1
 77 make[1]: *** [Makefile:1992: /var/lib/dkms/rtl8821CU/5.4.1/build] Error 2
 78 make[1]: Leaving directory '/usr/lib/modules/6.1.5-arch2-1/build'
 79 make: *** [Makefile:2217: modules] Error 2

@iQiexie
Copy link

iQiexie commented Jan 13, 2023

worked with running

$ make
$ sudo make install

Instead of

$ sudo ./dkms-install.sh

Thanks for the fix ❤

@lmaxyz
Copy link

lmaxyz commented Jan 20, 2023

Like in @Neykuratick 's case - dkms installation hasn't worked. But make and make install works instead.

@fancywriter
Copy link

Hello!
Any plans for merging it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants