shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: GKI: fix up build break where timer_delete_sync() was used

Browse Source 
We reverted the commit that renamed del_timer_sync() to
timer_delete_sync() a long while back, but that broke the build when
commit 5071beb59e ("tcp/dccp: Don't use timer_pending() in
reqsk_queue_unlink().") was applied.  So fix it up to use the old
function name instead, allowing the build to work properly.

Fixes: 5071beb59e ("tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink().")
Change-Id: I88112c8da97506f5c0028119f318ae8f730105fa
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-11-15 17:46:44 +00:00
parent a332a3d23d
commit 45a7ce8a2b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/inet_connection_sock.c
View File

@@ -987,7 +987,7 @@ static bool __inet_csk_reqsk_queue_drop(struct sock *sk,
{ {
bool unlinked = reqsk_queue_unlink(req); bool unlinked = reqsk_queue_unlink(req);
if (!from_timer && timer_delete_sync(&req->rsk_timer)) if (!from_timer && del_timer_sync(&req->rsk_timer))
reqsk_put(req); reqsk_put(req);
if (unlinked) { if (unlinked) {