From 45a7ce8a2b6d0126ec03713359bba96d9de1b3b2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 15 Nov 2024 17:46:44 +0000 Subject: [PATCH] ANDROID: GKI: fix up build break where timer_delete_sync() was used We reverted the commit that renamed del_timer_sync() to timer_delete_sync() a long while back, but that broke the build when commit 5071beb59ee4 ("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: 5071beb59ee4 ("tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink().") Change-Id: I88112c8da97506f5c0028119f318ae8f730105fa Signed-off-by: Greg Kroah-Hartman --- net/ipv4/inet_connection_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 7aad52ced0cd..f08fc0020dab 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -987,7 +987,7 @@ static bool __inet_csk_reqsk_queue_drop(struct sock *sk, { 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); if (unlinked) {