[PATCH mptcp-next 1/2] Squash to "mptcp: simplify push_pending" v5

[Geliang Tang <geliang.tang@suse.com>]

Update return values of __subflow_push_pending.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/protocol.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index f08c0eb0be11..ff2c1bbf4484 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1527,7 +1527,7 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk,
 
 			ret = mptcp_sendmsg_frag(sk, ssk, dfrag, info);
 			if (ret <= 0) {
-				err = ret;
+				err = copied ? : ret;
 				goto out;
 			}
 
@@ -1542,17 +1542,18 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk,
 		if (msk->snd_burst <= 0 ||
 		    !sk_stream_memory_free(ssk) ||
 		    !mptcp_subflow_active(mptcp_subflow_ctx(ssk))) {
-			err = -EAGAIN;
+			err = copied ? : -EAGAIN;
 			goto out;
 		}
+
 		mptcp_set_timeout(sk);
 	}
+	err = copied;
 
 out:
 	if (copied) {
 		tcp_push(ssk, 0, info->mss_now, tcp_sk(ssk)->nonagle,
 			 info->size_goal);
-		err = copied;
 	}
 
 	return err;
-- 
2.35.3