diff options
| author | Florian Westphal <fw@strlen.de> | 2020-07-05 01:30:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-04 17:56:22 -0700 |
| commit | 83f0c10bc36f956102ce4a33c5fe596ae9891297 (patch) | |
| tree | 748a717768cd39a766c5988cb13f19c7a0dab440 /net/mptcp | |
| parent | f551e2fdaf81b7b561bb5dc590da13f21c4c1295 (diff) | |
| download | linux-83f0c10bc36f956102ce4a33c5fe596ae9891297.tar.gz linux-83f0c10bc36f956102ce4a33c5fe596ae9891297.tar.bz2 linux-83f0c10bc36f956102ce4a33c5fe596ae9891297.zip | |
net: use mptcp setsockopt function for SOL_SOCKET on mptcp sockets
setsockopt(mptcp_fd, SOL_SOCKET, ...)... appears to work (returns 0),
but it has no effect -- this is because the MPTCP layer never has a
chance to copy the settings to the subflow socket.
Skip the generic handling for the mptcp case and instead call the
mptcp specific handler instead for SOL_SOCKET too.
Next patch adds more specific handling for SOL_SOCKET to mptcp.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp')
| -rw-r--r-- | net/mptcp/protocol.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fa137a9c42d1..320f306ea85c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1609,6 +1609,9 @@ static int mptcp_setsockopt(struct sock *sk, int level, int optname, pr_debug("msk=%p", msk); + if (level == SOL_SOCKET) + return sock_setsockopt(sk->sk_socket, level, optname, optval, optlen); + /* @@ the meaning of setsockopt() when the socket is connected and * there are multiple subflows is not yet defined. It is up to the * MPTCP-level socket to configure the subflows until the subflow |