Page MenuHomeFreeBSD
Files F168198357

D24418.diff
No OneTemporary
Actions

D24418.diff
View Options

Index: head/sys/netinet/in_proto.c
===================================================================
--- head/sys/netinet/in_proto.c
+++ head/sys/netinet/in_proto.c
@@ -163,7 +163,7 @@
.pr_input = sctp_input,
.pr_ctlinput = sctp_ctlinput,
.pr_ctloutput = sctp_ctloutput,
- .pr_drain = sctp_drain,
+ .pr_drain = NULL, /* Covered by the SOCK_SEQPACKET entry. */
.pr_usrreqs = &sctp_usrreqs
},
#endif /* SCTP */
Index: head/sys/netinet6/in6_proto.c
===================================================================
--- head/sys/netinet6/in6_proto.c
+++ head/sys/netinet6/in6_proto.c
@@ -172,11 +172,11 @@
.pr_input = tcp6_input,
.pr_ctlinput = tcp6_ctlinput,
.pr_ctloutput = tcp_ctloutput,
-#ifndef INET /* don't call initialization and timeout routines twice */
+#ifndef INET /* don't call initialization, timeout, and drain routines twice */
.pr_init = tcp_init,
.pr_slowtimo = tcp_slowtimo,
-#endif
.pr_drain = tcp_drain,
+#endif
.pr_usrreqs = &tcp6_usrreqs,
},
#ifdef SCTP
@@ -188,8 +188,8 @@
.pr_input = sctp6_input,
.pr_ctlinput = sctp6_ctlinput,
.pr_ctloutput = sctp_ctloutput,
+#ifndef INET /* Do not call initialization and drain routines twice. */
.pr_drain = sctp_drain,
-#ifndef INET /* Do not call initialization twice. */
.pr_init = sctp_init,
#endif
.pr_usrreqs = &sctp6_usrreqs
@@ -202,7 +202,7 @@
.pr_input = sctp6_input,
.pr_ctlinput = sctp6_ctlinput,
.pr_ctloutput = sctp_ctloutput,
- .pr_drain = sctp_drain,
+ .pr_drain = NULL, /* Covered by the SOCK_SEQPACKET entry. */
.pr_usrreqs = &sctp6_usrreqs
},
#endif /* SCTP */

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 8:29 PM (7 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37415638
Default Alt Text
D24418.diff (1 KB)

Event Timeline