mptcp: move mptcp_options_received's port initialization

Move mptcp_options_received's port initialization from
mptcp_parse_option to mptcp_get_options, put it together with
the other fields initializations of mptcp_options_received.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 1ff3469938b69054cb573a32afd23e38208f5b18..a044dd43411d9d9e0858e52aebb0335caf9a3ca0 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -241,7 +241,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
                }
 
                mp_opt->add_addr = 1;
-               mp_opt->port = 0;
                mp_opt->addr_id = *ptr++;
                pr_debug("ADD_ADDR: id=%d, echo=%d", mp_opt->addr_id, mp_opt->echo);
                if (mp_opt->family == MPTCP_ADDR_IPVERSION_4) {
@@ -298,6 +297,7 @@ void mptcp_get_options(const struct sk_buff *skb,
        mp_opt->mp_join = 0;
        mp_opt->add_addr = 0;
        mp_opt->ahmac = 0;
+       mp_opt->port = 0;
        mp_opt->rm_addr = 0;
        mp_opt->dss = 0;