| Message ID | 20200302093442.1481757-1-matthieu.baerts@tessares.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | mptcp: fix wrong merge resolution | expand |
On Mon, 2020-03-02 at 10:34 +0100, Matthieu Baerts wrote: > Otherwise the data are never init and we get warnings in workqueue code. > > I really don't know how I made this mistake :-/ > > Fixes: ce2d7fb36478 (tgupdate: merge t/mptcp-introduce-MPTCP-retransmission-timer base into t/mptcp-introduce-MPTCP-retransmission-timer) > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> LGTM, Thanks! /P
Hi Paolo, On 02/03/2020 14:43, Paolo Abeni wrote: > On Mon, 2020-03-02 at 10:34 +0100, Matthieu Baerts wrote: >> Otherwise the data are never init and we get warnings in workqueue code. >> >> I really don't know how I made this mistake :-/ >> >> Fixes: ce2d7fb36478 (tgupdate: merge t/mptcp-introduce-MPTCP-retransmission-timer base into t/mptcp-introduce-MPTCP-retransmission-timer) >> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > > LGTM, Thanks! Thank you for the review: - 05d850dd0f09: "squashed" in "mptcp: introduce MPTCP retransmission timer" - I didn't add the signed-off-by, it was a wrong merge resolution. - fa603a295c69..ee3a464ce517: result Tests + export will be launched soon. Cheers, Matt
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b8e71d5a4ff9..d20f19b779fb 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1106,6 +1106,8 @@ static int __mptcp_init_sock(struct sock *sk) msk->first = NULL; inet_csk(sk)->icsk_sync_mss = mptcp_sync_mss; + mptcp_pm_data_init(msk); + /* re-use the csk retrans timer for MPTCP-level retrans */ timer_setup(&msk->sk.icsk_retransmit_timer, mptcp_retransmit_timer, 0);
Otherwise the data are never init and we get warnings in workqueue code. I really don't know how I made this mistake :-/ Fixes: ce2d7fb36478 (tgupdate: merge t/mptcp-introduce-MPTCP-retransmission-timer base into t/mptcp-introduce-MPTCP-retransmission-timer) Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> --- Notes: to be squashed in "mptcp: introduce MPTCP retransmission timer" net/mptcp/protocol.c | 2 ++ 1 file changed, 2 insertions(+)