]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'mptcp-simplify-mptcp_accept'
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Mar 2020 07:19:03 +0000 (00:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Mar 2020 07:19:03 +0000 (00:19 -0700)
Paolo Abeni says:

====================
mptcp: simplify mptcp_accept()

Currently we allocate the MPTCP master socket at accept time.

The above makes mptcp_accept() quite complex, and requires checks is several
places for NULL MPTCP master socket.

These series simplify the MPTCP accept implementation, moving the master socket
allocation at syn-ack time, so that we drop unneeded checks with the follow-up
patch.

v1 -> v2:
- rebased on top of e106062d02ae2e497e616bf728aafe34867c5ca7
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge