mptcp: add sk parameter for mptcp_get_options

This patch added a new parameter name sk in mptcp_get_options().

Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 1468774f1f87156c47c44e52ebed317a28499a22..ae69059583a73efba3fae11a1a4072b6d844c9f2 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -323,7 +323,8 @@ static void mptcp_parse_option(const struct sk_buff *skb,
        }
 }
 
-void mptcp_get_options(const struct sk_buff *skb,
+void mptcp_get_options(const struct sock *sk,
+                      const struct sk_buff *skb,
                       struct mptcp_options_received *mp_opt)
 {
        const struct tcphdr *th = tcp_hdr(skb);
@@ -1024,7 +1025,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)
                return;
        }
 
-       mptcp_get_options(skb, &mp_opt);
+       mptcp_get_options(sk, skb, &mp_opt);
        if (!check_fully_established(msk, sk, subflow, skb, &mp_opt))
                return;
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 09e94726e030ee03c1f624ffec5defaee2369f95..a7ed0b8eb9bc425233eb079918b0c8330ef2148f 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -586,7 +586,8 @@ int __init mptcp_proto_v6_init(void);
 struct sock *mptcp_sk_clone(const struct sock *sk,
                            const struct mptcp_options_received *mp_opt,
                            struct request_sock *req);
-void mptcp_get_options(const struct sk_buff *skb,
+void mptcp_get_options(const struct sock *sk,
+                      const struct sk_buff *skb,
                       struct mptcp_options_received *mp_opt);
 
 void mptcp_finish_connect(struct sock *sk);

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 45acab63c387eed807549c57e5361ca86443bf4c..aa6b307b27c84a38cf0a31d8898d1612da88d09b 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -151,7 +151,7 @@ static int subflow_check_req(struct request_sock *req,
                return -EINVAL;
 #endif
 
-       mptcp_get_options(skb, &mp_opt);
+       mptcp_get_options(sk_listener, skb, &mp_opt);
 
        if (mp_opt.mp_capable) {
                SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MPCAPABLEPASSIVE);
@@ -248,7 +248,7 @@ int mptcp_subflow_init_cookie_req(struct request_sock *req,
        int err;
 
        subflow_init_req(req, sk_listener);
-       mptcp_get_options(skb, &mp_opt);
+       mptcp_get_options(sk_listener, skb, &mp_opt);
 
        if (mp_opt.mp_capable && mp_opt.mp_join)
                return -EINVAL;
@@ -395,7 +395,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
        subflow->ssn_offset = TCP_SKB_CB(skb)->seq;
        pr_debug("subflow=%p synack seq=%x", subflow, subflow->ssn_offset);
 
-       mptcp_get_options(skb, &mp_opt);
+       mptcp_get_options(sk, skb, &mp_opt);
        if (subflow->request_mptcp) {
                if (!mp_opt.mp_capable) {
                        MPTCP_INC_STATS(sock_net(sk),
@@ -639,7 +639,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
                 * reordered MPC will cause fallback, but we don't have other
                 * options.
                 */
-               mptcp_get_options(skb, &mp_opt);
+               mptcp_get_options(sk, skb, &mp_opt);
                if (!mp_opt.mp_capable) {
                        fallback = true;
                        goto create_child;
@@ -649,7 +649,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
                if (!new_msk)
                        fallback = true;
        } else if (subflow_req->mp_join) {
-               mptcp_get_options(skb, &mp_opt);
+               mptcp_get_options(sk, skb, &mp_opt);
                if (!mp_opt.mp_join || !subflow_hmac_valid(req, &mp_opt) ||
                    !mptcp_can_accept_new_subflow(subflow_req->msk)) {
                        SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKMAC);