mptcp: drop unused sk in mptcp_push_release

Since mptcp_set_timeout() had removed from mptcp_push_release() in
commit 33d41c9cd74c5 ("mptcp: more accurate timeout"), the argument
sk in mptcp_push_release() became useless. Let's drop it.

Fixes: 33d41c9cd74c5 ("mptcp: more accurate timeout")
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 81ef592113a5bc2b70ee26274a35a6c72c613177..eb316bd578bb28c54db553f667bbf96eabf6cf30 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1469,8 +1469,7 @@ static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk)
        return NULL;
 }
 
-static void mptcp_push_release(struct sock *sk, struct sock *ssk,
-                              struct mptcp_sendmsg_info *info)
+static void mptcp_push_release(struct sock *ssk, struct mptcp_sendmsg_info *info)
 {
        tcp_push(ssk, 0, info->mss_now, tcp_sk(ssk)->nonagle, info->size_goal);
        release_sock(ssk);
@@ -1533,7 +1532,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)
                         * the last round, release prev_ssk
                         */
                        if (ssk != prev_ssk && prev_ssk)
-                               mptcp_push_release(sk, prev_ssk, &info);
+                               mptcp_push_release(prev_ssk, &info);
                        if (!ssk)
                                goto out;
 
@@ -1546,7 +1545,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)
 
                        ret = mptcp_sendmsg_frag(sk, ssk, dfrag, &info);
                        if (ret <= 0) {
-                               mptcp_push_release(sk, ssk, &info);
+                               mptcp_push_release(ssk, &info);
                                goto out;
                        }
 
@@ -1561,7 +1560,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)
 
        /* at this point we held the socket lock for the last subflow we used */
        if (ssk)
-               mptcp_push_release(sk, ssk, &info);
+               mptcp_push_release(ssk, &info);
 
 out:
        /* ensure the rtx timer is running */