Skip to content

timers: Replace del_timer_sync() with timer_delete_sync() for Linux >= 6.1.84 #77

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

timers: Replace del_timer_sync() with timer_delete_sync() for Linux >= 6.1.84 #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions vwifi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,11 @@ static int vwifi_delete_interface(struct vwifi_vif *vif)

cancel_work_sync(&vif->ws_scan);
cancel_work_sync(&vif->ws_scan_timeout);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 84)
timer_delete_sync(&vif->scan_complete);
#else
del_timer_sync(&vif->scan_complete);
#endif

/* If there's a pending scan, call cfg80211_scan_done to finish it. */
if (vif->scan_request) {
Expand All @@ -1985,7 +1989,11 @@ static int vwifi_delete_interface(struct vwifi_vif *vif)
}

/* Make sure that no work is queued */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 84)
timer_delete_sync(&vif->scan_timeout);
#else
del_timer_sync(&vif->scan_timeout);
#endif
cancel_work_sync(&vif->ws_connect);
cancel_work_sync(&vif->ws_disconnect);

Expand Down