diff mbox series

[v1,3/5] Squash-to: "mptcp: Add handling of incoming MP_JOIN requests"

Message ID 09e4e68d2a32dedf5a021a9ecafa38cdb18bb788.1584728932.git.pabeni@redhat.com
State Accepted, archived
Delegated to: Matthieu Baerts
Headers show
Series squash and cleanup | expand

Commit Message

Paolo Abeni March 20, 2020, 6:34 p.m. UTC 
Drop another unneeded check, and remote the paired, obsoleted
comment.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 net/mptcp/options.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 3d6000f98e69..df8184aba3e1 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -661,8 +661,7 @@  static bool check_fully_established(struct mptcp_sock *msk, struct sock *sk,
 	subflow->can_ack = 1;
 
 fully_established:
-	/* msk can be null for MPC subflow on passive socket */
-	if (subflow->pm_notified || !msk)
+	if (likely(subflow->pm_notified))
 		return true;
 
 	subflow->pm_notified = 1;