diff --git a/[refs] b/[refs] index f501189a5590..42a17a09f6d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 811265b8e8bf84e3b91507bf6a3a8eea20e7a4b7 +refs/heads/master: 2b80230a7f8cd346c1e2ebafdd02be432bf10459 diff --git a/trunk/net/dccp/input.c b/trunk/net/dccp/input.c index f01d588299c8..c74034cf7ede 100644 --- a/trunk/net/dccp/input.c +++ b/trunk/net/dccp/input.c @@ -562,6 +562,12 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, return 0; } + if (unlikely(dh->dccph_type == DCCP_PKT_SYNC)) { + dccp_send_sync(sk, DCCP_SKB_CB(skb)->dccpd_seq, + DCCP_PKT_SYNCACK); + goto discard; + } + switch (sk->sk_state) { case DCCP_CLOSED: return 1;