mptcp: move the declarations of ssk and subflow
Move the declarations of ssk and subflow in MP_FAIL and MP_PRIO to the beginning of the function mptcp_write_options(). Signed-off-by: Geliang Tang <geliang.tang@suse.com> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
156a532b48
commit
d7889cfa0b
@ -1264,10 +1264,10 @@ static u16 mptcp_make_csum(const struct mptcp_ext *mpext)
|
||||
void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,
|
||||
struct mptcp_out_options *opts)
|
||||
{
|
||||
if (unlikely(OPTION_MPTCP_FAIL & opts->suboptions)) {
|
||||
const struct sock *ssk = (const struct sock *)tp;
|
||||
struct mptcp_subflow_context *subflow;
|
||||
|
||||
if (unlikely(OPTION_MPTCP_FAIL & opts->suboptions)) {
|
||||
subflow = mptcp_subflow_ctx(ssk);
|
||||
subflow->send_mp_fail = 0;
|
||||
|
||||
@ -1489,9 +1489,6 @@ mp_rst:
|
||||
}
|
||||
|
||||
if (OPTION_MPTCP_PRIO & opts->suboptions) {
|
||||
const struct sock *ssk = (const struct sock *)tp;
|
||||
struct mptcp_subflow_context *subflow;
|
||||
|
||||
subflow = mptcp_subflow_ctx(ssk);
|
||||
subflow->send_mp_prio = 0;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user