* [PATCH mptcp-next] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache"
@ 2021-09-06 9:41 Paolo Abeni
2021-09-07 18:39 ` Mat Martineau
2021-09-09 16:57 ` Matthieu Baerts
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Abeni @ 2021-09-06 9:41 UTC (permalink / raw)
To: mptcp
A small cleanup for the tcp_tx_skb_cache removal: we don't
need to check for skb in zero win probe (matttbe)
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/protocol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2a525c7ae920..8c34c6339454 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1336,7 +1336,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
if (copy == 0) {
u64 snd_una = READ_ONCE(msk->snd_una);
- if (skb || snd_una != msk->snd_nxt) {
+ if (snd_una != msk->snd_nxt) {
tcp_remove_empty_skb(ssk, tcp_write_queue_tail(ssk));
return 0;
}
--
2.26.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH mptcp-next] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache"
2021-09-06 9:41 [PATCH mptcp-next] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache" Paolo Abeni
@ 2021-09-07 18:39 ` Mat Martineau
2021-09-09 16:57 ` Matthieu Baerts
1 sibling, 0 replies; 3+ messages in thread
From: Mat Martineau @ 2021-09-07 18:39 UTC (permalink / raw)
To: Paolo Abeni; +Cc: mptcp
On Mon, 6 Sep 2021, Paolo Abeni wrote:
> A small cleanup for the tcp_tx_skb_cache removal: we don't
> need to check for skb in zero win probe (matttbe)
>
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> net/mptcp/protocol.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index 2a525c7ae920..8c34c6339454 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -1336,7 +1336,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
> if (copy == 0) {
> u64 snd_una = READ_ONCE(msk->snd_una);
>
> - if (skb || snd_una != msk->snd_nxt) {
> + if (snd_una != msk->snd_nxt) {
> tcp_remove_empty_skb(ssk, tcp_write_queue_tail(ssk));
> return 0;
> }
> --
> 2.26.3
Thanks for the fixup, looks good to squash.
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH mptcp-next] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache"
2021-09-06 9:41 [PATCH mptcp-next] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache" Paolo Abeni
2021-09-07 18:39 ` Mat Martineau
@ 2021-09-09 16:57 ` Matthieu Baerts
1 sibling, 0 replies; 3+ messages in thread
From: Matthieu Baerts @ 2021-09-09 16:57 UTC (permalink / raw)
To: Paolo Abeni, Mat Martineau; +Cc: mptcp
Hi Paolo, Mat,
On 06/09/2021 11:41, Paolo Abeni wrote:
> A small cleanup for the tcp_tx_skb_cache removal: we don't
> need to check for skb in zero win probe (matttbe)
Thank you for the patch and the review!
- e4bb25dfcd2d: "squashed" in "mptcp: stop relying on tcp_tx_skb_cache"
- Results: 5fabcaa6857a..84da6403b775
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210909T165704
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210909T165704
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-09 16:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-06 9:41 [PATCH mptcp-next] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache" Paolo Abeni
2021-09-07 18:39 ` Mat Martineau
2021-09-09 16:57 ` Matthieu Baerts
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).