| Message ID | 9b71955a98bb1d28d8c5603d007a6a22aa584082.1603943436.git.geliangtang@gmail.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [mptcp-next] mptcp: add mptcp_pm_should_add_signal_echo helper | expand |
On Thu, 29 Oct 2020, Geliang Tang wrote: > This patch added a new helper mptcp_pm_should_add_signal_echo. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > net/mptcp/pm.c | 2 +- > net/mptcp/protocol.h | 5 +++++ > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c > index 83f59a428560..75c5040e8d5d 100644 > --- a/net/mptcp/pm.c > +++ b/net/mptcp/pm.c > @@ -198,7 +198,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, > if (!mptcp_pm_should_add_signal(msk)) > goto out_unlock; > > - *echo = READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); > + *echo = mptcp_pm_should_add_signal_echo(msk); > > if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo)) > goto out_unlock; > diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h > index 7a5c16f176c0..d29c6a4749eb 100644 > --- a/net/mptcp/protocol.h > +++ b/net/mptcp/protocol.h > @@ -529,6 +529,11 @@ static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) > return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL); > } > > +static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk) > +{ > + return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); > +} > + > static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk) > { > return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6); > -- > 2.26.2 Thanks for the cleanup Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> -- Mat Martineau Intel
Hi Mat, Mat Martineau <mathew.j.martineau@linux.intel.com> 于2020年10月30日周五 上午8:03写道： > > > On Thu, 29 Oct 2020, Geliang Tang wrote: > > > This patch added a new helper mptcp_pm_should_add_signal_echo. > > > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > > --- > > net/mptcp/pm.c | 2 +- > > net/mptcp/protocol.h | 5 +++++ > > 2 files changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c > > index 83f59a428560..75c5040e8d5d 100644 > > --- a/net/mptcp/pm.c > > +++ b/net/mptcp/pm.c > > @@ -198,7 +198,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, > > if (!mptcp_pm_should_add_signal(msk)) > > goto out_unlock; > > > > - *echo = READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); > > + *echo = mptcp_pm_should_add_signal_echo(msk); > > > > if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo)) > > goto out_unlock; > > diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h > > index 7a5c16f176c0..d29c6a4749eb 100644 > > --- a/net/mptcp/protocol.h > > +++ b/net/mptcp/protocol.h > > @@ -529,6 +529,11 @@ static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) > > return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL); > > } > > > > +static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk) > > +{ > > + return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); > > +} > > + > > static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk) > > { > > return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6); > > -- > > 2.26.2 > > Thanks for the cleanup > > Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Thanks for your review. I think it is better to squash this patch to the original commit "mptcp: change add_addr_signal type". So I just sent out a new version of it to ML as: [PATCH v2 mptcp-next] Squash to "mptcp: change add_addr_signal type" -Geliang > > -- > Mat Martineau > Intel
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 83f59a428560..75c5040e8d5d 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -198,7 +198,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, if (!mptcp_pm_should_add_signal(msk)) goto out_unlock; - *echo = READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); + *echo = mptcp_pm_should_add_signal_echo(msk); if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo)) goto out_unlock; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7a5c16f176c0..d29c6a4749eb 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -529,6 +529,11 @@ static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL); } +static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk) +{ + return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); +} + static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);
This patch added a new helper mptcp_pm_should_add_signal_echo. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/pm.c | 2 +- net/mptcp/protocol.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)