| Message ID | 20200320004122.91365-1-mathew.j.martineau@linux.intel.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | squash-to: mptcp: Add path manager interface | expand |
On Thu, 2020-03-19 at 17:41 -0700, Mat Martineau wrote: > Move some minor changes from "mptcp: Implement path manager interface > commands" to reduce churn within the patch set. Does not cause conflicts > later in the series. > > Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> > --- > net/mptcp/pm.c | 2 +- > net/mptcp/protocol.h | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c > index f17db5517544..ad837da0193d 100644 > --- a/net/mptcp/pm.c > +++ b/net/mptcp/pm.c > @@ -99,7 +99,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) > WRITE_ONCE(msk->pm.addr_signal, false); > WRITE_ONCE(msk->pm.accept_addr, false); > WRITE_ONCE(msk->pm.accept_subflow, false); > - msk->pm.status = MPTCP_PM_IDLE; > + msk->pm.status = 0; > > spin_lock_init(&msk->pm.lock); > INIT_WORK(&msk->pm.work, pm_worker); > diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h > index 9f9e397eee1e..8d4761ae3951 100644 > --- a/net/mptcp/protocol.h > +++ b/net/mptcp/protocol.h > @@ -99,7 +99,6 @@ struct mptcp_addr_info { > }; > > enum mptcp_pm_status { > - MPTCP_PM_IDLE, > MPTCP_PM_ADD_ADDR_RECEIVED, > MPTCP_PM_ESTABLISHED, > MPTCP_PM_SUBFLOW_ESTABLISHED, > @@ -124,7 +123,7 @@ struct mptcp_pm_data { > u8 add_addr_accept_max; > u8 local_addr_max; > u8 subflows_max; > - enum mptcp_pm_status status; > + u8 status; > > struct work_struct work; > }; LGTM, thanks! (My intention was to squash changes this way when I posted the patches, but I was likely too low on coffee :) /P
Hi Mat, Paolo, On 20/03/2020 02:01, Paolo Abeni wrote: > On Thu, 2020-03-19 at 17:41 -0700, Mat Martineau wrote: >> Move some minor changes from "mptcp: Implement path manager interface >> commands" to reduce churn within the patch set. Does not cause conflicts >> later in the series. >> >> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> (...) > > LGTM, thanks! > > (My intention was to squash changes this way when I posted the patches, > but I was likely too low on coffee :) Thank you for the patch and the review! - f25e2388ecbc: "squashed" in "mptcp: Add path manager interface" - 498995c58801: "Signed-off-by" + "Co-developed-by" - 10a5c66719de..1d4ba9d3d46e: result Tests + export are in progress! Cheers, Matt
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index f17db5517544..ad837da0193d 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -99,7 +99,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) WRITE_ONCE(msk->pm.addr_signal, false); WRITE_ONCE(msk->pm.accept_addr, false); WRITE_ONCE(msk->pm.accept_subflow, false); - msk->pm.status = MPTCP_PM_IDLE; + msk->pm.status = 0; spin_lock_init(&msk->pm.lock); INIT_WORK(&msk->pm.work, pm_worker); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 9f9e397eee1e..8d4761ae3951 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -99,7 +99,6 @@ struct mptcp_addr_info { }; enum mptcp_pm_status { - MPTCP_PM_IDLE, MPTCP_PM_ADD_ADDR_RECEIVED, MPTCP_PM_ESTABLISHED, MPTCP_PM_SUBFLOW_ESTABLISHED, @@ -124,7 +123,7 @@ struct mptcp_pm_data { u8 add_addr_accept_max; u8 local_addr_max; u8 subflows_max; - enum mptcp_pm_status status; + u8 status; struct work_struct work; };
Move some minor changes from "mptcp: Implement path manager interface commands" to reduce churn within the patch set. Does not cause conflicts later in the series. Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> --- net/mptcp/pm.c | 2 +- net/mptcp/protocol.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)