From 786bcc49fb2a66510465dd555f5da4a902efd5ad Mon Sep 17 00:00:00 2001 From: David Hill Date: Wed, 1 Feb 2017 20:59:48 +0000 Subject: In sogetopt, preallocate an mbuf to avoid using sleeping mallocs with the netlock held. This also changes the prototypes of the *ctloutput functions to take an mbuf instead of an mbuf pointer. help, guidance from bluhm@ and mpi@ ok bluhm@ --- sys/netinet/tcp_var.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/netinet/tcp_var.h') diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index fdf468af7d5..e04a16f7b31 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_var.h,v 1.120 2017/01/29 19:58:47 bluhm Exp $ */ +/* $OpenBSD: tcp_var.h,v 1.121 2017/02/01 20:59:47 dhill Exp $ */ /* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */ /* @@ -602,7 +602,7 @@ int tcp_freeq(struct tcpcb *); void tcp6_ctlinput(int, struct sockaddr *, u_int, void *); #endif void tcp_ctlinput(int, struct sockaddr *, u_int, void *); -int tcp_ctloutput(int, struct socket *, int, int, struct mbuf **); +int tcp_ctloutput(int, struct socket *, int, int, struct mbuf *); struct tcpcb * tcp_disconnect(struct tcpcb *); struct tcpcb * -- cgit v1.2.3