Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
+8
-1
net/dccp/input.c
+8
-1
net/dccp/input.c
···
50
50
return;
51
51
}
52
52
53
-
dccp_set_state(sk, DCCP_CLOSING);
53
+
if (sk->sk_state != DCCP_CLOSING)
54
+
dccp_set_state(sk, DCCP_CLOSING);
54
55
dccp_send_close(sk, 0);
55
56
}
56
57
···
560
559
} else if (dh->dccph_type == DCCP_PKT_CLOSE) {
561
560
dccp_rcv_close(sk, skb);
562
561
return 0;
562
+
}
563
+
564
+
if (unlikely(dh->dccph_type == DCCP_PKT_SYNC)) {
565
+
dccp_send_sync(sk, DCCP_SKB_CB(skb)->dccpd_seq,
566
+
DCCP_PKT_SYNCACK);
567
+
goto discard;
563
568
}
564
569
565
570
switch (sk->sk_state) {