From: Florian Westphal <fw@strlen.de>
To: <netdev@vger.kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
bigeasy@linutronix.de, vschneid@redhat.com
Subject: [PATCH net-next v8 3/3] tcp: move inet_twsk_schedule helper out of header
Date: Thu, 6 Jun 2024 17:11:39 +0200 [thread overview]
Message-ID: <20240606151332.21384-4-fw@strlen.de> (raw)
In-Reply-To: <20240606151332.21384-1-fw@strlen.de>
Its no longer used outside inet_timewait_sock.c, so move it there.
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
No changes since last version.
include/net/inet_timewait_sock.h | 5 -----
net/ipv4/inet_timewait_sock.c | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 5b43d220243d..f88b68269012 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -101,11 +101,6 @@ void inet_twsk_hashdance_schedule(struct inet_timewait_sock *tw,
void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo,
bool rearm);
-static inline void inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo)
-{
- __inet_twsk_schedule(tw, timeo, false);
-}
-
static inline void inet_twsk_reschedule(struct inet_timewait_sock *tw, int timeo)
{
__inet_twsk_schedule(tw, timeo, true);
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index b2d97c816c99..337390ba85b4 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -92,6 +92,11 @@ static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
hlist_nulls_add_head_rcu(&tw->tw_node, list);
}
+static void inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo)
+{
+ __inet_twsk_schedule(tw, timeo, false);
+}
+
/*
* Enter the time wait state.
* Essentially we whip up a timewait bucket, copy the relevant info into it
--
2.44.2
next prev parent reply other threads:[~2024-06-06 15:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 15:11 [PATCH net-next v8 0/3] net: tcp: un-pin tw timer Florian Westphal
2024-06-06 15:11 ` [PATCH net-next v8 1/3] net: tcp/dccp: prepare for tw_timer un-pinning Florian Westphal
2024-06-06 15:11 ` [PATCH net-next v8 2/3] net: tcp: un-pin the tw_timer Florian Westphal
2024-06-07 5:51 ` Eric Dumazet
2024-06-06 15:11 ` Florian Westphal [this message]
2024-06-06 15:23 ` [PATCH net-next v8 0/3] net: tcp: un-pin tw timer Sebastian Andrzej Siewior
2024-06-10 11:00 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240606151332.21384-4-fw@strlen.de \
--to=fw@strlen.de \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=vschneid@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).