From: Paolo Abeni <pabeni@redhat.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Mat Martineau <mathew.j.martineau@linux.intel.com>,
Ayush Sawal <ayush.sawal@chelsio.com>,
Eric Dumazet <edumazet@google.com>,
mptcp@lists.linux.dev
Subject: [RFC PATCH 2/5] tcp: expose the tcp_mark_push() and skb_entail() helpers
Date: Fri, 17 Sep 2021 17:38:37 +0200 [thread overview]
Message-ID: <07fd053d2c2239e70b20b105ff6f33d299dabea7.1631888517.git.pabeni@redhat.com> (raw)
In-Reply-To: <cover.1631888517.git.pabeni@redhat.com>
They will be used by the next patch.
Acked-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
include/net/tcp.h | 2 ++
net/ipv4/tcp.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 3166dc15d7d6..dc52ea8adfc7 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -581,6 +581,8 @@ __u32 cookie_v6_init_sequence(const struct sk_buff *skb, __u16 *mss);
#endif
/* tcp_output.c */
+void skb_entail(struct sock *sk, struct sk_buff *skb);
+void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb);
void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,
int nonagle);
int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e8b48df73c85..7a3e632b0048 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -647,7 +647,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
}
EXPORT_SYMBOL(tcp_ioctl);
-static inline void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb)
+void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb)
{
TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_PSH;
tp->pushed_seq = tp->write_seq;
@@ -658,7 +658,7 @@ static inline bool forced_push(const struct tcp_sock *tp)
return after(tp->write_seq, tp->pushed_seq + (tp->max_window >> 1));
}
-static void skb_entail(struct sock *sk, struct sk_buff *skb)
+void skb_entail(struct sock *sk, struct sk_buff *skb)
{
struct tcp_sock *tp = tcp_sk(sk);
struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
--
2.26.3
next prev parent reply other threads:[~2021-09-17 15:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-17 15:38 [RFC PATCH 0/5] net: remove sk skb caches Paolo Abeni
2021-09-17 15:38 ` [RFC PATCH 1/5] chtls: rename skb_entail() to chtls_skb_entail() Paolo Abeni
2021-09-17 15:38 ` Paolo Abeni [this message]
2021-09-17 16:43 ` [RFC PATCH 2/5] tcp: expose the tcp_mark_push() and skb_entail() helpers Eric Dumazet
2021-09-17 17:28 ` Paolo Abeni
2021-09-17 15:38 ` [RFC PATCH 3/5] mptcp: stop relying on tcp_tx_skb_cache Paolo Abeni
2021-09-17 15:38 ` [RFC PATCH 4/5] Partially revert "tcp: factor out tcp_build_frag()" Paolo Abeni
2021-09-17 16:41 ` Eric Dumazet
2021-09-17 17:31 ` Paolo Abeni
2021-09-17 15:38 ` [RFC PATCH 5/5] tcp: remove sk_{tr}x_skb_cache Paolo Abeni
2021-09-17 16:47 ` [RFC PATCH 0/5] net: remove sk skb caches Eric Dumazet
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=07fd053d2c2239e70b20b105ff6f33d299dabea7.1631888517.git.pabeni@redhat.com \
--to=pabeni@redhat.com \
--cc=ayush.sawal@chelsio.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
/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).