| Message ID | c389f95f768ed57163765418c1f1670e08bba8e1.1607639386.git.pabeni@redhat.com |
|---|---|
| State | Accepted, archived |
| Commit | 02754ad8b65ee8a1cad45f3f942db47ade61656b |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [mptcp-next] Squash-to: "mptcp: push pending frames when subflow has free space" | expand |
On Thu, 10 Dec 2020, Paolo Abeni wrote: > whoops, checking the free space on the wrong sock > Looks good to squash, thanks for spotting this. > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > net/mptcp/options.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/mptcp/options.c b/net/mptcp/options.c > index f4e6808691ed..973867f73952 100644 > --- a/net/mptcp/options.c > +++ b/net/mptcp/options.c > @@ -881,7 +881,7 @@ static void ack_update_msk(struct mptcp_sock *msk, > > /* this assumes mptcp_incoming_options() is invoked after tcp_ack() */ > if (after64(msk->wnd_end, READ_ONCE(msk->snd_nxt)) && > - sk_stream_memory_free(sk)) > + sk_stream_memory_free(ssk)) > __mptcp_check_push(sk, ssk); > > if (after64(new_snd_una, old_snd_una)) { > -- > 2.26.2 -- Mat Martineau Intel
Hi Paolo, Mat,
On 10/12/2020 23:32, Paolo Abeni wrote:
> whoops, checking the free space on the wrong sock
Good catch, thank you for the patch and the review!
- 02754ad8b65e: "squashed" in mptcp: push pending frames when subflow
has free space
- Results: 2f380236959a..af3a2ae8147a
Tests + export are in progress!
Cheers,
Matt
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index f4e6808691ed..973867f73952 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -881,7 +881,7 @@ static void ack_update_msk(struct mptcp_sock *msk, /* this assumes mptcp_incoming_options() is invoked after tcp_ack() */ if (after64(msk->wnd_end, READ_ONCE(msk->snd_nxt)) && - sk_stream_memory_free(sk)) + sk_stream_memory_free(ssk)) __mptcp_check_push(sk, ssk); if (after64(new_snd_una, old_snd_una)) {
whoops, checking the free space on the wrong sock Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/mptcp/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)