Merge branch 'mptcp-fixes-for-6-1'
authorJakub Kicinski <kuba@kernel.org>
Tue, 25 Oct 2022 04:14:00 +0000 (21:14 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 25 Oct 2022 04:14:01 +0000 (21:14 -0700)
commitfe1fd0ccd8b2c9861f79c26a926b5fc1f38cf9ba
treef41c853b709583c6d6e6bc26b1d569311453a764
parent4a4b6848d1e932b977e6a00cda393adf7e839ff8
parentfa9e57468aa10e91deca6d82ccd17c73ffdd1e40
Merge branch 'mptcp-fixes-for-6-1'

Mat Martineau says:

====================
mptcp: Fixes for 6.1

Patch 1 fixes an issue with assigning subflow IDs in cases where an
incoming MP_JOIN is processed before accept() completes on the MPTCP
socket.

Patches 2 and 3 fix a deadlock issue with fastopen code (new for 6.1) at
connection time.
====================

Link: https://lore.kernel.org/r/20221021225856.88119-1-mathew.j.martineau@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>