Commit 995383b1 authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent 862aecd1

net/mptcp/protocol.h

+4 −2
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ struct mptcp_sock { 
			nodelay:1,

			fastopening:1,

			in_accept_queue:1,

			free_first:1;

			free_first:1,

			rcvspace_init:1;

	struct work_struct work;

	struct sk_buff  *ooo_last_skb;

	struct rb_root  out_of_order_queue;
@@ -1114,7 +1115,8 @@ static inline bool subflow_simultaneous_connect(struct sock *sk) 
{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);



	return (1 << sk->sk_state) & (TCPF_ESTABLISHED | TCPF_FIN_WAIT1) &&

	return (1 << sk->sk_state) &

	       (TCPF_ESTABLISHED | TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSING) &&

	       is_active_ssk(subflow) &&

	       !subflow->conn_finished;

}