Commit 781bf13d authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller

mptcp: remove unneeded check on first subflow

Currently we explicitly check for the first subflow being
NULL in a couple of places, even if we don't need any
special actions in such scenario.

Just drop the unneeded checks, to avoid confusion.
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5695eb88
...@@ -952,7 +952,7 @@ bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq, bool us ...@@ -952,7 +952,7 @@ bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq, bool us
* should match. If they mismatch, the peer is misbehaving and * should match. If they mismatch, the peer is misbehaving and
* we will prefer the most recent information. * we will prefer the most recent information.
*/ */
if (READ_ONCE(msk->rcv_data_fin) || !READ_ONCE(msk->first)) if (READ_ONCE(msk->rcv_data_fin))
return false; return false;
WRITE_ONCE(msk->rcv_data_fin_seq, WRITE_ONCE(msk->rcv_data_fin_seq,
......
...@@ -493,7 +493,7 @@ static bool mptcp_check_data_fin(struct sock *sk) ...@@ -493,7 +493,7 @@ static bool mptcp_check_data_fin(struct sock *sk)
u64 rcv_data_fin_seq; u64 rcv_data_fin_seq;
bool ret = false; bool ret = false;
if (__mptcp_check_fallback(msk) || !msk->first) if (__mptcp_check_fallback(msk))
return ret; return ret;
/* Need to ack a DATA_FIN received from a peer while this side /* Need to ack a DATA_FIN received from a peer while this side
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment