mptcp: drop unneeded argument

After commit 3a236aef280e ("mptcp: refactor passive socket initialization"),
every mptcp_pm_fully_established() call is always invoked with a
GFP_ATOMIC argument. We can then drop it.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 355f798d575a40542195fcc724819e1de9f2e4e7..cd3b885c8faa88c39ac6e809b1b46e46d5959280 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -1001,7 +1001,7 @@ check_notify:
                clear_3rdack_retransmission(ssk);
                mptcp_pm_subflow_established(msk);
        } else {
-               mptcp_pm_fully_established(msk, ssk, GFP_ATOMIC);
+               mptcp_pm_fully_established(msk, ssk);
        }
        return true;
 

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 70f0ced3ca86e18dd0a63d56bfc2c0ded3b31a33..78c924506e83958678c1bc94f5df89eebd89763f 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -126,7 +126,7 @@ static bool mptcp_pm_schedule_work(struct mptcp_sock *msk,
        return true;
 }
 
-void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp)
+void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk)
 {
        struct mptcp_pm_data *pm = &msk->pm;
        bool announce = false;
@@ -150,7 +150,7 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk,
        spin_unlock_bh(&pm->lock);
 
        if (announce)
-               mptcp_event(MPTCP_EVENT_ESTABLISHED, msk, ssk, gfp);
+               mptcp_event(MPTCP_EVENT_ESTABLISHED, msk, ssk, GFP_ATOMIC);
 }
 
 void mptcp_pm_connection_closed(struct mptcp_sock *msk)

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index e1310bc113bef7e37f708e442b24394b5af78644..a9eb0e428a6be0cde1b31b2d38a3b4126a7ff623 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -782,7 +782,7 @@ bool mptcp_pm_addr_families_match(const struct sock *sk,
 void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk);
 void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk);
 void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int server_side);
-void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp);
+void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk);
 bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk);
 void mptcp_pm_connection_closed(struct mptcp_sock *msk);
 void mptcp_pm_subflow_established(struct mptcp_sock *msk);

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index f46d8f6c40aafb6e3f0d4498f59bce9e4d8bb05f..80bbe96c06943f2e0a7efdd1c7a1327a8345e986 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -850,7 +850,7 @@ create_child:
                         */
                        if (mp_opt.suboptions & OPTION_MPTCP_MPC_ACK) {
                                mptcp_subflow_fully_established(ctx, &mp_opt);
-                               mptcp_pm_fully_established(owner, child, GFP_ATOMIC);
+                               mptcp_pm_fully_established(owner, child);
                                ctx->pm_notified = 1;
                        }
                } else if (ctx->mp_join) {