[MPTCP] [PATCH 3/7] remove second conditional

[MPTCP] [PATCH 3/7] remove second conditional

[Florian Westphal]

[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]

squashto: mptcp: Handle MP_CAPABLE options for outgoing connections

... there is no reason for this second conditional, one is enough.

Signed-off-by: Florian Westphal <fw(a)strlen.de>
---
 net/mptcp/protocol.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index f65c48a0069a..72e6950fbbc2 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -901,7 +901,6 @@ static void mptcp_close(struct sock *sk, long timeout)
 {
 	struct mptcp_subflow_context *subflow, *tmp;
 	struct mptcp_sock *msk = mptcp_sk(sk);
-	struct socket *ssk = NULL;
 
 	mptcp_token_destroy(msk->token);
 	inet_sk_state_store(sk, TCP_CLOSE);
@@ -909,15 +908,10 @@ static void mptcp_close(struct sock *sk, long timeout)
 	lock_sock(sk);
 
 	if (msk->subflow) {
-		ssk = msk->subflow;
+		sock_release(msk->subflow);
 		msk->subflow = NULL;
 	}
 
-	if (ssk) {
-		pr_debug("subflow=%p", ssk->sk);
-		sock_release(ssk);
-	}
-
 	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
 		pr_debug("conn_list->subflow=%p", subflow);
 		sock_release(mptcp_subflow_tcp_socket(subflow));
-- 
2.23.0