diff options
| author |   Geliang Tang <geliangtang@xiaomi.com> | 2021-09-24 14:12:35 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-09-25 11:36:51 +0100 |
| commit | 13ac17a32bf1fefbc0bd412545a907979fda26b6 (patch) | |
| tree | 1ed2f48e24eb5f2ccdaeb9470b94139c7d920e85 /net/mptcp | |
| parent | mptcp: do not shrink snd_nxt when recovering (diff) | |
| download | linux-dev-13ac17a32bf1fefbc0bd412545a907979fda26b6.tar.xz linux-dev-13ac17a32bf1fefbc0bd412545a907979fda26b6.zip | |
mptcp: use OPTIONS_MPTCP_MPC
Since OPTIONS_MPTCP_MPC has been defined, use it instead of open-coding.
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Geliang Tang <geliangtang@xiaomi.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp')
| -rw-r--r-- | net/mptcp/options.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 1ec6529c4326..422f4acfb3e6 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -748,9 +748,7 @@ static bool mptcp_established_options_mp_prio(struct sock *sk, /* can't send MP_PRIO with MPC, as they share the same option space: * 'backup'. Also it makes no sense at all */ - if (!subflow->send_mp_prio || - ((OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_SYNACK | - OPTION_MPTCP_MPC_ACK) & opts->suboptions)) + if (!subflow->send_mp_prio || (opts->suboptions & OPTIONS_MPTCP_MPC)) return false; /* account for the trailing 'nop' option */ @@ -1327,8 +1325,7 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, TCPOPT_NOP << 8 | TCPOPT_NOP, ptr); } } - } else if ((OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_SYNACK | - OPTION_MPTCP_MPC_ACK) & opts->suboptions) { + } else if (OPTIONS_MPTCP_MPC & opts->suboptions) { u8 len, flag = MPTCP_CAP_HMAC_SHA256; if (OPTION_MPTCP_MPC_SYN & opts->suboptions) { |