From: David S. Miller <davem@davemloft.net>
Date: Sun, 15 Mar 2020 07:19:03 +0000 (-0700)
Subject: Merge branch 'mptcp-simplify-mptcp_accept'
X-Git-Tag: v5.7-rc1~146^2~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a79c838fb049cf4cfe1affc0b0c013c43e1561f1;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'mptcp-simplify-mptcp_accept'

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 2398e3991bda7caa6b112a6f650fbab92f732b91
====================

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

a79c838fb049cf4cfe1affc0b0c013c43e1561f1