@@ -1147,18 +1147,6 @@ static int mptcp_getname(struct socket *sock, struct sockaddr *uaddr,
struct sock *ssk;
int ret;
- if (sock->sk->sk_prot == &tcp_prot) {
- /* we are being invoked from __sys_accept4, after
- * mptcp_accept() has just accepted a non-mp-capable
- * flow: sk is a tcp_sk, not an mptcp one.
- *
- * Hand the socket over to tcp so all further socket ops
- * bypass mptcp.
- */
- sock->ops = &inet_stream_ops;
- return sock->ops->getname(sock, uaddr, peer);
- }
-
lock_sock(sock->sk);
ssock = __mptcp_fallback_get_ref(msk);
if (ssock) {
@@ -1184,6 +1172,28 @@ static int mptcp_getname(struct socket *sock, struct sockaddr *uaddr,
return ret;
}
+static int mptcp_v4_getname(struct socket *sock, struct sockaddr *uaddr,
+ int peer)
+{
+ int ret;
+
+ if (sock->sk->sk_prot == &tcp_prot) {
+ /* we are being invoked from __sys_accept4, after
+ * mptcp_accept() has just accepted a non-mp-capable
+ * flow: sk is a tcp_sk, not an mptcp one.
+ *
+ * Hand the socket over to tcp so all further socket ops
+ * bypass mptcp.
+ */
+ sock->ops = &inet_stream_ops;
+ return sock->ops->getname(sock, uaddr, peer);
+ }
+
+ ret = mptcp_getname(sock, uaddr, peer);
+
+ return ret;
+}
+
static int mptcp_listen(struct socket *sock, int backlog)
{
struct mptcp_sock *msk = mptcp_sk(sock->sk);
@@ -1300,7 +1310,7 @@ void mptcp_proto_init(void)
mptcp_stream_ops.connect = mptcp_stream_connect;
mptcp_stream_ops.poll = mptcp_poll;
mptcp_stream_ops.accept = mptcp_stream_accept;
- mptcp_stream_ops.getname = mptcp_getname;
+ mptcp_stream_ops.getname = mptcp_v4_getname;
mptcp_stream_ops.listen = mptcp_listen;
mptcp_stream_ops.shutdown = mptcp_shutdown;
Split mptcp_getname into two parts: af-specific part and functional part. squashto: Create SUBFLOW socket for incoming connections Signed-off-by: Peter Krystad <peter.krystad@linux.intel.com> --- net/mptcp/protocol.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-)