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

rtl8192du: Improve 5.19.2/6.0.0 changes a little bit #96

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions os_dep/ioctl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -5688,10 +5688,10 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
rtw_cfg80211_indicate_scan_done(adapter, _TRUE);

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
if (wdev->connected) {
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
if (wdev->links[0].client.current_bss) {
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
if (wdev->connected) {
#else
if (wdev->current_bss) {
#endif
Expand Down
12 changes: 6 additions & 6 deletions os_dep/os_intfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,10 +711,10 @@ void rtw_unregister_netdevs(struct dvobj_priv *dvobj)
if (padapter->DriverState != DRIVER_DISAPPEAR) {
#ifdef CONFIG_IOCTL_CFG80211
struct wireless_dev *wdev = padapter->rtw_wdev;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
wdev->connected = NULL;
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
wdev->links[0].client.current_bss = NULL;
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
wdev->connected = 0;
#else
wdev->current_bss = NULL;
#endif
Expand Down Expand Up @@ -2290,10 +2290,10 @@ static int netdev_close(struct net_device *pnetdev)

#ifdef CONFIG_IOCTL_CFG80211
wdev->iftype = NL80211_IFTYPE_STATION;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
wdev->connected = NULL;
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
wdev->links[0].client.current_bss = NULL;
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
wdev->connected = 0;
#else
wdev->current_bss = NULL;
#endif
Expand Down