diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-20 16:32:59 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-20 16:32:59 -0700 |
| commit | e8488574e3b66ef0bbc7ac90219828566eb02683 (patch) | |
| tree | 7f3c34a7d248cf4810ff20eaccbc79686aa61383 /net | |
| parent | 47b5d2a107396ab05e83a4dfbd30b563ecbc83af (diff) | |
| parent | 65b8c8a620a390a901522f19beed1476e2274feb (diff) | |
| download | linux-e8488574e3b66ef0bbc7ac90219828566eb02683.tar.bz2 | |
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: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mptcp/options.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 092a2d48bfd3..a044dd43411d 100644 --- 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) { @@ -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; |