diff options
| -rw-r--r-- | sys/kern/uipc_socket.c | 11 | ||||
| -rw-r--r-- | sys/netinet/tcp_input.c | 4 | ||||
| -rw-r--r-- | sys/sys/socketvar.h | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index ae9ed7b9f23..f3de909f3ae 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.283 2022/08/15 09:11:38 mvs Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.284 2022/08/21 16:22:17 mvs Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -407,7 +407,7 @@ drop: (void) soqremque(so2, 0); if (persocket) sounlock(so); - (void) soabort(so2); + soabort(so2); if (persocket) solock(so); } @@ -417,7 +417,7 @@ drop: (void) soqremque(so2, 1); if (persocket) sounlock(so); - (void) soabort(so2); + soabort(so2); if (persocket) solock(so); } @@ -431,12 +431,11 @@ discard: return (error); } -int +void soabort(struct socket *so) { soassertlocked(so); - - return pru_abort(so); + pru_abort(so); } int diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 7df100facfc..a6c59623c38 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.377 2022/08/11 09:13:21 claudio Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.378 2022/08/21 16:22:17 mvs Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -3659,7 +3659,7 @@ resetandabort: abort: m_freem(m); if (so != NULL) - (void) soabort(so); + soabort(so); syn_cache_put(sc); tcpstat_inc(tcps_sc_aborted); return ((struct socket *)(-1)); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index fa96d7cc0b9..eb9721b5527 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: socketvar.h,v 1.107 2022/08/13 21:01:46 mvs Exp $ */ +/* $OpenBSD: socketvar.h,v 1.108 2022/08/21 16:22:18 mvs Exp $ */ /* $NetBSD: socketvar.h,v 1.18 1996/02/09 18:25:38 christos Exp $ */ /*- @@ -313,7 +313,7 @@ int sbreserve(struct socket *, struct sockbuf *, u_long); int sbwait(struct socket *, struct sockbuf *); int sb_lock(struct sockbuf *); void soinit(void); -int soabort(struct socket *); +void soabort(struct socket *); int soaccept(struct socket *, struct mbuf *); int sobind(struct socket *, struct mbuf *, struct proc *); void socantrcvmore(struct socket *); |