commit 033d974405276c22609c45d50167dd11df20aa82
author David S. Miller <davem@sunset.davemloft.net> Tue Sep 13 16:32:40 2005 -0700
committer David S. Miller <davem@sunset.davemloft.net> Tue Sep 13 16:32:40 2005 -0700
tree bf57f52fe748be2f1fd48fdb890732345abf0763
parent ae01d2798d1825307044d75de11eb5c9ffb79c5a
parent 2b80230a7f8cd346c1e2ebafdd02be432bf10459

Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 

net/dccp/input.c

diff --git a/net/dccp/input.c b/net/dccp/input.c
index c60bc34..c74034c 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -50,7 +50,8 @@
 		return;
 	}
 
-	dccp_set_state(sk, DCCP_CLOSING);
+	if (sk->sk_state != DCCP_CLOSING)
+		dccp_set_state(sk, DCCP_CLOSING);
 	dccp_send_close(sk, 0);
 }
 
@@ -561,6 +562,12 @@
 		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;