Commit e8488574 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'init-ahmac-and-port-of-mptcp_options_received' 

Geliang Tang says:

====================
init ahmac and port of mptcp_options_received

This patchset deals with initializations of mptcp_options_received's two
fields, ahmac and port.
====================

Link: https://lore.kernel.org/r/cover.1603102503.git.geliangtang@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 47b5d2a1 65b8c8a6

net/mptcp/options.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {
@@ -297,6 +296,8 @@ void mptcp_get_options(const struct sk_buff *skb, 
	mp_opt->mp_capable = 0;

	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;