mptcp: Restore lost hunk
Subsystems (2)
Peter Krystad
PATCH 1/1 mptcp: Restore lost hunk
This chunk from Patch 01 "Extend path manager interface" of the Implement outgoing MP_JOIN patchset did not survive getting squashed and needs to be restored.
squashto: Add path manager interface
Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
--- net/mptcp/options.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/mptcp/options.c +10 -0
@@ -534,6 +534,16 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb, mp_opt = &opt_rx->mptcp; +if (msk && mp_opt->add_addr) { +if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) +pm_add_addr (msk, &mp_opt->addr, mp_opt->addr_id); +#if IS_ENABLED (CONFIG_IPV6 ) + else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6) + pm_add_addr6(msk, &mp_opt->addr6, mp_opt->addr_id); +#endif + mp_opt->add_addr =0 ; + } +if (!mp_opt->dss)return ;
Signature · 1 line
2.17.2
Matthieu Baerts
Hi Peter,
Quoted 5 lines · Peter Krystad
This chunk from Patch 01 "Extend path manager interface" of the Implement outgoing
MP_JOINpatchset did not survive getting squashed and needs to be restored.squashto: Add path manager interface
Thank you for the patch and again good catch for having seen the missing part (sorry for that)! Just applied the patch:
- 5d51e217f066: "squashed" in "mptcp: Add path manager interface"
- 328298c32eac..3558511b2489: result
Tests and export in progress.
Cheers,
Matt
Signature · 5 lines
Matthieu Baerts | R&D Engineer matthieu.baerts(a)tessares.net Tessares SA | Hybrid Access Solutions www.tessares.net 1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium