Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / net / mptcp / pm_netlink.c

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 1e4289c..c4f9a5c 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -644,15 +644,12 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)
        subflow = list_first_entry_or_null(&msk->conn_list, typeof(*subflow), node);
        if (subflow) {
                struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
-               bool slow;
 
                spin_unlock_bh(&msk->pm.lock);
                pr_debug("send ack for %s",
                         mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr");
 
-               slow = lock_sock_fast(ssk);
-               tcp_send_ack(ssk);
-               unlock_sock_fast(ssk, slow);
+               mptcp_subflow_send_ack(ssk);
                spin_lock_bh(&msk->pm.lock);
        }
 }
@@ -669,7 +666,6 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
                struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
                struct sock *sk = (struct sock *)msk;
                struct mptcp_addr_info local;
-               bool slow;
 
                local_address((struct sock_common *)ssk, &local);
                if (!addresses_equal(&local, addr, addr->port))
@@ -682,9 +678,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
 
                spin_unlock_bh(&msk->pm.lock);
                pr_debug("send ack for mp_prio");
-               slow = lock_sock_fast(ssk);
-               tcp_send_ack(ssk);
-               unlock_sock_fast(ssk, slow);
+               mptcp_subflow_send_ack(ssk);
                spin_lock_bh(&msk->pm.lock);
 
                return 0;