| Message ID | 6ec124da60099420355e8d0c0cb9bfeea13e5774.1594999871.git.pabeni@redhat.com |
|---|---|
| State | Accepted, archived |
| Commit | e0fbd14074eb4058066e95a663dbb9c93fbf447e |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | Squash-to: "subflow: introduce and use mptcp_can_accept_new_subflow()" | expand |
On Fri, 17 Jul 2020, Paolo Abeni wrote: > Use the newly introduced helper. No change to the commit message > required. > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > net/mptcp/subflow.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c > index edc29c2dec73..362637766d74 100644 > --- a/net/mptcp/subflow.c > +++ b/net/mptcp/subflow.c > @@ -55,7 +55,7 @@ static void subflow_generate_hmac(u64 key1, u64 key2, u32 nonce1, u32 nonce2, > > static bool mptcp_can_accept_new_subflow(const struct mptcp_sock *msk) > { > - return inet_sk_state_load((struct sock *)msk) == TCP_ESTABLISHED && > + return mptcp_is_fully_established((void *)msk) && > READ_ONCE(msk->pm.accept_subflow); > } > > -- > 2.26.2 Looks good to squash after the previous patch is ready. -- Mat Martineau Intel
Hi Paolo, Mat, On 17/07/2020 19:38, Mat Martineau wrote: > > On Fri, 17 Jul 2020, Paolo Abeni wrote: > >> Use the newly introduced helper. No change to the commit message >> required. >> >> Signed-off-by: Paolo Abeni <pabeni@redhat.com> ... > Looks good to squash after the previous patch is ready. Thank you for the patch and the review! - e0fbd14074eb: "squashed" in "subflow: introduce and use mptcp_can_accept_new_subflow()" - 72a81073a595..c3af46e86fd8: result Tests + export are in progress! Cheers, Matt
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index edc29c2dec73..362637766d74 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -55,7 +55,7 @@ static void subflow_generate_hmac(u64 key1, u64 key2, u32 nonce1, u32 nonce2, static bool mptcp_can_accept_new_subflow(const struct mptcp_sock *msk) { - return inet_sk_state_load((struct sock *)msk) == TCP_ESTABLISHED && + return mptcp_is_fully_established((void *)msk) && READ_ONCE(msk->pm.accept_subflow); }
Use the newly introduced helper. No change to the commit message required. Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/mptcp/subflow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)